2002-03-23 James A. Morrison <ja2morri@uwaterloo.ca>

	* fstests.c: Include <error.h>.
	(main): Use error, not perror.
	[HURDISH_TESTS]: Use this rather then having the code in question
	#if 0'd out.
	* timertest.c: Include <error.h> and <errno.h>
	(main): Use error, not perror and exit.

2 files changed, 24 insertions, 27 deletions

diff --git a/fstests/fstests.c b/fstests/fstests.c
index 5e72f0b0..4a0b35d5 100644
--- a/fstests/fstests.c
+++ b/fstests/fstests.c
@@ -1,5 +1,5 @@
 /* Test filesystem behavior
-   Copyright (C) 1993,94,2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1993,94,2000,01,02 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -27,6 +27,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <hurd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <error.h>
 #include <unistd.h>
 
 int check_refs (mach_port_t port) /* To call from gdb */
@@ -42,48 +43,48 @@ int
 main ()
 {
   mach_port_t root;
-#if 0
+#if HURDISH_TESTS
   extern file_t *_hurd_init_dtable;
   char string[] = "Did this get into the file?\n";
   file_t filetowrite;
   retry_type retry;
   char pathbuf[1024];
   int written;
-  int err;
+  error_t err;
 #endif
 
   root = getcrdir ();
 
   printf ("fstests running...\n");
 
-#if 0
+#if HURDISH_TESTS
   if ((err = dir_unlink (root, "CREATED")) && err != ENOENT)
-    printf ("Error on unlink: %d\n", err);
+    error (0, err, "Error on unlink");
   else if (err = dir_lookup (root, "CREATED", O_WRITE | O_CREAT, 0666,
 			     &retry, pathbuf, &filetowrite))
-    printf ("Error on lookup: %d\n", err);
+    error (0, err, "Error on lookup");
   else if (err = io_write (filetowrite, string, strlen (string), -1, &written))
-    printf ("Error on write: %d\n", err);
+    error (0, err, "Error on write");
   else if (written != strlen (string))
-    printf ("Short write: %d\n", written);
+    error (0, 0, "Short write: %d\n", written);
   else if (err = file_syncfs (filetowrite, 1, 0))
-    printf ("Error on sync: %d\n", err);
+    error (0, err, "Error on sync");
 #else
 
   if (unlink ("/newdir"))
-    perror ("unlink");
+    error (0, errno, "unlink");
   if (rmdir ("/newdir"))
-    perror ("1st rmdir");
+    error (0, errno, "1st rmdir");
   if (mkdir ("/newdir", 0777))
-    perror ("1st mkdir");
+    error (0, errno, "1st mkdir");
   if (rename ("/newdir", "/newdir2"))
-    perror ("1st rename");
+    error (0, errno, "1st rename");
   if (rmdir ("/foo"))
-    perror ("2nd rmdir");
+    error (0, errno, "2nd rmdir");
   if (mkdir ("/foo", 0777))
-    perror ("2nd mkdir");
+    error (0, errno, "2nd mkdir");
   if (rename ("/newdir2", "/foo"))
-    perror ("2nd rename");
+    error (0, errno, "2nd rename");
   sync ();
 #endif
 
diff --git a/fstests/timertest.c b/fstests/timertest.c
index a2c8a7da..2d602560 100644
--- a/fstests/timertest.c
+++ b/fstests/timertest.c
@@ -1,5 +1,5 @@
-/*
-   Copyright (C) 1994, 2001 Free Software Foundation, Inc.
+/* A test for the Hurd timer and getchar
+   Copyright (C) 1994,2001,02 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -19,6 +19,8 @@
 #include <sys/time.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <errno.h>
+#include <error.h>
 
 void
 alarm_handler (int signo)
@@ -28,7 +30,7 @@ alarm_handler (int signo)
 }
 
 int
-main()
+main(int argc, char *argv[])
 {
   struct itimerval real_timer;
 
@@ -40,10 +42,7 @@ main()
   signal (SIGALRM, alarm_handler);
 
   if (setitimer (ITIMER_REAL, &real_timer, 0) < 0)
-    {
-      perror ("Setting timer");
-      exit (1);
-    }
+    error (1, errno, "Setting timer");
 
   while (1)
     {
@@ -52,10 +51,7 @@ main()
       fflush (stdout);
       c = getchar ();
       if (ferror (stdin))
-	{
-	  perror ("getchar");
-	  exit (1);
-	}
+	error (1, errno, "getchar");
       if (c == EOF)
 	{
 	  puts ("Saw EOF.  Pausing (no input)...");