shadow-maint / shadow

Upstream shadow tree
Other
292 stars 228 forks source link

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

Closed alejandro-colomar closed 5 months ago

alejandro-colomar commented 7 months ago

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.

alejandro-colomar commented 7 months ago

v2 changes:

$ git range-diff shadow/master gh/ARGSUSED ARGSUSED 
1:  852d732c = 1:  852d732c lib/, src/: Use int main(void) where appropriate
-:  -------- > 2:  64497b63 src/sulogin.c: Invert logic to reduce indentation
alejandro-colomar commented 7 months ago

v2b changes:

$ git range-diff 08ae7af1..gh/ARGSUSED shadow/master..ARGSUSED 
1:  852d732c ! 1:  4e06271f lib/, src/: Use int main(void) where appropriate
    @@ src/id.c: static void usage (void)
        ruid = getuid ();

      ## src/sulogin.c ##
    -@@ src/sulogin.c: static void catch_signals (unused int sig)
    +@@ src/sulogin.c: static void catch_signals (MAYBE_UNUSED int sig)
      }

    @@ src/sulogin.c: static void catch_signals (unused int sig)
     +main(int argc, char *argv[])
      {
        int            err = 0;
    -   char           pass[BUFSIZ];
    +   char           **envp = environ;
     @@ src/sulogin.c: main(int argc, char **argv)
        termio.c_lflag |= (ECHO | ECHOE | ECHOK | ICANON | ISIG);
        tcsetattr (0, TCSANOW, &termio);
2:  64497b63 = 2:  8e826801 src/sulogin.c: Invert logic to reduce indentation
alejandro-colomar commented 6 months ago

v2c changes:

$ git range-diff alx/master..gh/ARGSUSED shadow/master..ARGSUSED 
1:  4e06271f = 1:  c00a2534 lib/, src/: Use int main(void) where appropriate
2:  8e826801 = 2:  85855a92 src/sulogin.c: Invert logic to reduce indentation
alejandro-colomar commented 6 months ago

v3 changes:

$ git range-diff gh/master..gh/ARGSUSED alx/master..ARGSUSED 
1:  c00a2534 ! 1:  f0bd9bc7 lib/, src/: Use int main(void) where appropriate
    @@ src/sulogin.c: static void catch_signals (MAYBE_UNUSED int sig)
        int            err = 0;
        char           **envp = environ;
     @@ src/sulogin.c: main(int argc, char **argv)
    -   termio.c_lflag |= (ECHO | ECHOE | ECHOK | ICANON | ISIG);
    -   tcsetattr (0, TCSANOW, &termio);
    - 
    --  Prog = Basename (argv[0]);
    -+  Prog = Basename(argv[0]);
    -   log_set_progname(Prog);
    -   log_set_logfd(stderr);
    -   (void) setlocale (LC_ALL, "");
        (void) bindtextdomain (PACKAGE, LOCALEDIR);
        (void) textdomain (PACKAGE);

2:  85855a92 = 2:  7ebcf349 src/sulogin.c: Invert logic to reduce indentation
alejandro-colomar commented 6 months ago

v3b changes:

$ git range-diff 89c4da43..gh/ARGSUSED  alx/master..ARGSUSED 
1:  f0bd9bc7 = 1:  7a13e6b7 lib/, src/: Use int main(void) where appropriate
2:  7ebcf349 = 2:  2fd86e96 src/sulogin.c: Invert logic to reduce indentation