1998-07-20 Roland McGrath <roland@baalperazim.frob.com>

	* firmlink.c (main): Fix return type to int, and use return.
	* fwd.c (main): Likewise.
	* new-fifo.c (main): Likewise.
	* magic.c (main): Likewise.
	* fifo.c (main): Likewise.
	* null.c (main): Likewise.

6 files changed, 22 insertions, 22 deletions

diff --git a/trans/fifo.c b/trans/fifo.c
index dd4776f7..0646db02 100644
--- a/trans/fifo.c
+++ b/trans/fifo.c
@@ -1,6 +1,6 @@
 /* A translator for fifos
 
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 
    Written by Miles Bader <miles@gnu.ai.mit.edu>
 
@@ -77,7 +77,7 @@ static const struct argp argp = {
   options, parse_opt, 0, "Translator for fifos"
 };
 
-void
+int
 main (int argc, char **argv)
 {
   error_t err;
@@ -101,13 +101,13 @@ main (int argc, char **argv)
   do
     {
       ports_enable_class (fsys->protid_class);
-      ports_manage_port_operations_multithread (fsys->pi.bucket, 
+      ports_manage_port_operations_multithread (fsys->pi.bucket,
 						trivfs_demuxer,
 						30*1000, 5*60*1000, 0);
     }
   while (ports_count_class (fsys->protid_class) > 0);
 
-  exit(0);
+  return 0;
 }
 
 /* ---------------------------------------------------------------- */
@@ -499,7 +499,7 @@ trivfs_S_file_set_size (struct trivfs_protid *cred,
 /* These four routines modify the O_APPEND, O_ASYNC, O_FSYNC, and
    O_NONBLOCK bits for the IO object. In addition, io_get_openmodes
    will tell you which of O_READ, O_WRITE, and O_EXEC the object can
-   be used for.  The O_ASYNC bit affects icky async I/O; good async 
+   be used for.  The O_ASYNC bit affects icky async I/O; good async
    I/O is done through io_async which is orthogonal to these calls. */
 
 error_t
diff --git a/trans/firmlink.c b/trans/firmlink.c
index 1012059e..568316dc 100644
--- a/trans/firmlink.c
+++ b/trans/firmlink.c
@@ -1,6 +1,6 @@
 /* A translator for `firmlinks'
 
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
 
    Written by Miles Bader <miles@gnu.ai.mit.edu>
 
@@ -65,7 +65,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
 
 static struct argp argp = { options, parse_opt, args_doc, doc };
 
-void
+int
 main (int argc, char **argv)
 {
   error_t err;
@@ -88,7 +88,7 @@ main (int argc, char **argv)
   ports_manage_port_operations_multithread (fsys->pi.bucket, trivfs_demuxer,
 					    2 * 60 * 1000, 0, 0);
 
-  exit (0);
+  return 0;
 }
 
 /* Return in LINK the node that TARGET_NAME resolves to, with its parent
diff --git a/trans/fwd.c b/trans/fwd.c
index 6b90d333..c36028e0 100644
--- a/trans/fwd.c
+++ b/trans/fwd.c
@@ -4,7 +4,7 @@
    and forward the request to the server if they find one, otherwise doing
    the translation themselves.
 
-   Copyright (C) 1995 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1998 Free Software Foundation, Inc.
 
    Written by Miles Bader <miles@gnu.ai.mit.edu>
 
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <hurd/fshelp.h>
 
-void
+int
 main (int argc, char **argv)
 {
   error_t err;
@@ -47,5 +47,5 @@ main (int argc, char **argv)
   if (err)
     error (3, err, "%s", argv[1]);
 
-  exit (0);
+  return 0;
 }
diff --git a/trans/magic.c b/trans/magic.c
index a8f764a0..733ce2d7 100644
--- a/trans/magic.c
+++ b/trans/magic.c
@@ -1,6 +1,6 @@
 /* A translator for returning FS_RETRY_MAGIC strings.
 
-   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc.
    Written by Miles Bader <miles@gnu.ai.mit.edu>
 
    This program is free software; you can redistribute it and/or
@@ -34,7 +34,7 @@ extern int fsys_server (mach_msg_header_t *, mach_msg_header_t *);
 /* The magic string we return for lookups.  */
 static char *magic = NULL;
 
-void
+int
 main (int argc, char **argv)
 {
   error_t err;
@@ -63,7 +63,7 @@ main (int argc, char **argv)
       err = mach_msg_server_timeout (fsys_server, 0, control,
 				       MACH_RCV_TIMEOUT, 1000 * 60 * 10);
       if (err == MACH_RCV_TIMED_OUT)
-	exit (0);
+	return 0;
     }
 }
 
diff --git a/trans/new-fifo.c b/trans/new-fifo.c
index f24eb107..9266b1e5 100644
--- a/trans/new-fifo.c
+++ b/trans/new-fifo.c
@@ -1,6 +1,6 @@
 /* A translator for fifos
 
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 
    Written by Miles Bader <miles@gnu.ai.mit.edu>
 
@@ -176,7 +176,7 @@ struct port_class *trivfs_cntl_portclasses[1];
 int trivfs_protid_nportclasses = 1;
 int trivfs_cntl_nportclasses = 1;
 
-void
+int
 main (int argc, char **argv)
 {
   error_t err;
@@ -230,7 +230,7 @@ main (int argc, char **argv)
     }
   while (ports_count_class (fifo_port_class) > 0);
 
-  exit (0);
+  return 0;
 }
 
 /* ---------------------------------------------------------------- */
@@ -681,7 +681,7 @@ trivfs_S_file_set_size (struct trivfs_protid *cred,
 /* These four routines modify the O_APPEND, O_ASYNC, O_FSYNC, and
    O_NONBLOCK bits for the IO object. In addition, io_get_openmodes
    will tell you which of O_READ, O_WRITE, and O_EXEC the object can
-   be used for.  The O_ASYNC bit affects icky async I/O; good async 
+   be used for.  The O_ASYNC bit affects icky async I/O; good async
    I/O is done through io_async which is orthogonal to these calls. */
 
 error_t
diff --git a/trans/null.c b/trans/null.c
index 78f3369c..44e19cc3 100644
--- a/trans/null.c
+++ b/trans/null.c
@@ -1,6 +1,6 @@
 /* A translator for providing endless empty space and immediate eof.
 
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 
    Written by Miles Bader <miles@gnu.ai.mit.edu>
 
@@ -34,7 +34,7 @@
 
 const char *argp_program_version = STANDARD_HURD_VERSION (null);
 
-void
+int
 main (int argc, char **argv)
 {
   error_t err;
@@ -57,7 +57,7 @@ main (int argc, char **argv)
   ports_manage_port_operations_multithread (fsys->pi.bucket, trivfs_demuxer,
 					    2 * 60 * 1000, 0, 0);
 
-  exit(0);
+  return 0;
 }
 
 /* Trivfs hooks  */
@@ -210,7 +210,7 @@ trivfs_S_file_set_size (struct trivfs_protid *cred, off_t size)
 /* These four routines modify the O_APPEND, O_ASYNC, O_FSYNC, and
    O_NONBLOCK bits for the IO object. In addition, io_get_openmodes
    will tell you which of O_READ, O_WRITE, and O_EXEC the object can
-   be used for.  The O_ASYNC bit affects icky async I/O; good async 
+   be used for.  The O_ASYNC bit affects icky async I/O; good async
    I/O is done through io_async which is orthogonal to these calls. */
 
 kern_return_t