lib/, src/: Use int main(void) where appropriate

Remove /*ARGSUSED*/ comments.  Instead, use appropriate declarators for
main().  ISO C allows using int main(void) if the parameters are going
to be unused.

Also, do some cosmetic changes in the uses of argc and argv, to show
where they are used.

And use *argv[], instead of **argv.  Array notation is friendlier, IMO.

Signed-off-by: Alejandro Colomar <alx@kernel.org>

diff --git a/lib/getdate.y b/lib/getdate.y
index 4b37fe70d73af888be1936f649bc532b13bd3354..8cea2cc4df3b04aa45b036422579e8ad489f3974 100644 (file)
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -923,11 +923,8 @@ time_t get_date (const char *p, const time_t *now)
 
 #if    defined (TEST)
 
-/* ARGSUSED */
 int
-main (ac, av)
-     int ac;
-     char *av[];
+main(void)
 {
   char buff[MAX_BUFF_LEN + 1];
   time_t d;

diff --git a/src/id.c b/src/id.c
index b4681bb11e0b23b7d21f44805ba43aa406b93358..673693e0b0059f8a34cf14ccf1dad0d2e5266c1c 100644 (file)
--- a/src/id.c
+++ b/src/id.c
@@ -36,7 +36,8 @@ static void usage (void)
        exit (EXIT_FAILURE);
 }
 
- /*ARGSUSED*/ int main (int argc, char **argv)
+int
+main(int argc, char *argv[])
 {
        uid_t ruid, euid;
        gid_t rgid, egid;
@@ -74,11 +75,10 @@ static void usage (void)
         */
 
        if (argc > 1) {
-               if ((argc > 2) || (strcmp (argv[1], "-a") != 0)) {
-                       usage ();
-               } else {
+               if (argc > 2 || strcmp(argv[1], "-a") != 0)
+                       usage();
+               else
                        aflg = true;
-               }
        }
 
        ruid = getuid ();

diff --git a/src/sulogin.c b/src/sulogin.c
index f4e42ab87413ed295b38ac50aea1ae8616c5ed0b..244a2acdf7214271447c777b2402b0a7bf5db5e6 100644 (file)
--- a/src/sulogin.c
+++ b/src/sulogin.c
@@ -53,8 +53,8 @@ static void catch_signals (MAYBE_UNUSED int sig)
 }
 
 
-/*ARGSUSED*/ int
-main(int argc, char **argv)
+int
+main(int argc, char *argv[])
 {
        int            err = 0;
        char           **envp = environ;
@@ -78,13 +78,13 @@ main(int argc, char **argv)
        (void) bindtextdomain (PACKAGE, LOCALEDIR);
        (void) textdomain (PACKAGE);
 
-       initenv ();
+       initenv();
        if (argc > 1) {
-               close (0);
-               close (1);
-               close (2);
+               close(0);
+               close(1);
+               close(2);
 
-               if (open (argv[1], O_RDWR) >= 0) {
+               if (open(argv[1], O_RDWR) >= 0) {
                        dup (0);
                        dup (0);
                } else {