From efd169e010f8c4dc7b6167e775dfae6b869150d5 Mon Sep 17 00:00:00 2001
From: Alejandro Colomar <alx@kernel.org>
Date: Thu, 18 Jan 2024 01:30:23 +0100
Subject: [PATCH] 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>
---
 lib/getdate.y |  5 +----
 src/id.c      | 10 +++++-----
 src/sulogin.c | 14 +++++++-------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/lib/getdate.y b/lib/getdate.y
index 4b37fe70..8cea2cc4 100644
--- 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 b4681bb1..673693e0 100644
--- 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 f4e42ab8..244a2acd 100644
--- 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 {