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

	* ps.c (main): Fix return type to int, and use return.
	* ids.c (main): Likewise.
	* w.c (main): Likewise.
	* login.c (main): Likewise.
	* settrans.c (main): Likewise.
	* showtrans.c (main): Likewise.
	* fsysopts.c (main): Likewise.
	* storeinfo.c (main): Likewise.

7 files changed, 25 insertions, 25 deletions

diff --git a/utils/fsysopts.c b/utils/fsysopts.c
index e8ddf145..79e40979 100644
--- a/utils/fsysopts.c
+++ b/utils/fsysopts.c
@@ -1,6 +1,6 @@
 /* Set options in a running filesystem
 
-   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>
 
@@ -49,7 +49,7 @@ static char *doc = "Get or set command line options for running translator FILES
 
 /* ---------------------------------------------------------------- */
 
-void 
+int
 main(int argc, char *argv[])
 {
   error_t err;
@@ -124,5 +124,5 @@ main(int argc, char *argv[])
       puts (argz);
     }
 
-  exit(0);
+  return 0;
 }
diff --git a/utils/ids.c b/utils/ids.c
index 8b867630..f8ad22c5 100644
--- a/utils/ids.c
+++ b/utils/ids.c
@@ -1,6 +1,6 @@
 /* Show all hurd ids
 
-   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>
 
@@ -47,7 +47,7 @@ static char *doc = "Show hurd uids/gids."
 
 /* ---------------------------------------------------------------- */
 
-void 
+int
 main(int argc, char *argv[])
 {
   error_t err;
@@ -192,5 +192,5 @@ main(int argc, char *argv[])
 		   show_eff ? "available" : 0);
     }
 
-  exit (0);
+  return 0;
 }
diff --git a/utils/login.c b/utils/login.c
index a9b3d8b8..02542ae2 100644
--- a/utils/login.c
+++ b/utils/login.c
@@ -1,6 +1,6 @@
 /* Hurdish login
 
-   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>
 
@@ -365,7 +365,7 @@ dog (time_t timeout, pid_t pid, char **argv)
     }
 }
 
-void
+int
 main(int argc, char *argv[])
 {
   int i;
@@ -857,7 +857,7 @@ main(int argc, char *argv[])
 
   /* No more authentications to fail, so cross our fingers and add our utmp
      entry.  */
-  
+
   if (pid == sid)
     /* Only add utmp entries for the session leader.  */
     add_utmp_entry (args, args_len, !idvec_contains (&parent_uids, 0));
@@ -885,5 +885,5 @@ main(int argc, char *argv[])
   if (err)
     error(5, err, "%s", shell);
 
-  exit(0);
+  return 0;
 }
diff --git a/utils/ps.c b/utils/ps.c
index ae6eeec6..3953350c 100644
--- a/utils/ps.c
+++ b/utils/ps.c
@@ -1,6 +1,6 @@
 /* Show process information.
 
-   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>
 
@@ -94,14 +94,14 @@ static const struct argp_option options[] =
   {"tail",	 0,       0,      OPTION_ALIAS},
   {"width",      'w',     "WIDTH",OA, "If WIDTH is given, try to format the"
                                       " output for WIDTH columns, otherwise,"
-				      " remove the default limit"}, 
+				      " remove the default limit"},
   {0, 0}
 };
 
 static const char doc[] =
 "Show information about processes PID... (default all `interesting' processes)"
 "\vThe USER, LID, PID, PGRP, and SID arguments may also be comma separated"
-" lists.  The System V options -u and -g may be accessed with -O and -G."; 
+" lists.  The System V options -u and -g may be accessed with -O and -G.";
 
 #define FILTER_OWNER		0x01
 #define FILTER_NOT_LEADER	0x02
@@ -162,7 +162,7 @@ lookup_user (const char *name, struct argp_state *state)
   return pw->pw_uid;
 }
 
-void 
+int
 main(int argc, char *argv[])
 {
   error_t err;
@@ -189,7 +189,7 @@ main(int argc, char *argv[])
   pid_t *pids = 0;		/* User-specified pids.  */
   size_t num_pids = 0;
   struct pids_argp_params pids_argp_params = { &pids, &num_pids, 1 };
-    
+
   /* Add a user who's processes should be printed out.  */
   error_t add_uid (uid_t uid, struct argp_state *state)
     {
@@ -438,5 +438,5 @@ main(int argc, char *argv[])
 	 output_width, print_heading,
 	 squash_bogus_fields, squash_nominal_fields, top);
 
-  exit (0);
+  return 0;
 }
diff --git a/utils/settrans.c b/utils/settrans.c
index 9bd70303..4f82c666 100644
--- a/utils/settrans.c
+++ b/utils/settrans.c
@@ -1,6 +1,6 @@
 /* Set a file's translator.
 
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 96, 97, 98 Free Software Foundation, Inc.
 
    Written by Miles Bader <miles@gnu.ai.mit.edu>
 
@@ -67,7 +67,7 @@ static char *doc = "Set the passive/active translator on NODE."
 
 /* ---------------------------------------------------------------- */
 
-void 
+int
 main(int argc, char *argv[])
 {
   error_t err;
@@ -210,5 +210,5 @@ main(int argc, char *argv[])
   if (err)
     error(5, err, "%s", node_name);
 
-  exit(0);
+  return 0;
 }
diff --git a/utils/showtrans.c b/utils/showtrans.c
index ebac9ccc..5ec36a0c 100644
--- a/utils/showtrans.c
+++ b/utils/showtrans.c
@@ -1,6 +1,6 @@
 /* Show files' passive translators.
 
-   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>
 
@@ -49,7 +49,7 @@ static char *doc = "Show the passive translator of FILE..."
 
 /* ---------------------------------------------------------------- */
 
-void 
+int
 main (int argc, char *argv[])
 {
   /* The default exit status -- changed to 0 if we find any translators.  */
@@ -139,5 +139,5 @@ main (int argc, char *argv[])
 
   argp_parse (&argp, argc, argv, 0, 0, 0);
 
-  exit (status);
+  return status;
 }
diff --git a/utils/storeinfo.c b/utils/storeinfo.c
index 13a5cfb2..b824c263 100644
--- a/utils/storeinfo.c
+++ b/utils/storeinfo.c
@@ -1,6 +1,6 @@
 /* Show where a file exists
 
-   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>
 
@@ -182,7 +182,7 @@ print_store (struct store *store, int level, unsigned what)
       print_store (store->children[i], level + 1, what);
 }
 
-void 
+int
 main(int argc, char *argv[])
 {
   int deref = 0, print_prefix = -1;
@@ -251,5 +251,5 @@ main(int argc, char *argv[])
 
   argp_parse (&argp, argc, argv, 0, 0, 0);
 
-  exit(0);
+  return 0;
 }