*: remove some uses of argc

function                                             old     new   delta
whoami_main                                           34      37      +3
logname_main                                          60      63      +3
hostid_main                                           35      38      +3
ttysize_main                                         136     135      -1
nmeter_main                                          673     672      -1
logger_main                                          387     386      -1
uuencode_main                                        330     328      -2
ifupdown_main                                       2125    2123      -2
mesg_main                                            158     155      -3
free_main                                            333     330      -3
cal_main                                             902     899      -3
acpid_main                                           443     440      -3
ar_main                                              196     189      -7
find_main                                            476     467      -9
ifconfig_main                                       1235    1221     -14
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/12 up/down: 9/-49)            Total: -40 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

6 files changed, 17 insertions, 17 deletions

diff --git a/coreutils/cal.c b/coreutils/cal.c
index 7973b82a1..1f498fb7f 100644
--- a/coreutils/cal.c
+++ b/coreutils/cal.c
@@ -77,7 +77,7 @@ static char *build_row(char *p, unsigned *dp);
 #define HEAD_SEP        2               /* spaces between day headings */
 
 int cal_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int cal_main(int argc, char **argv)
+int cal_main(int argc UNUSED_PARAM, char **argv)
 {
         struct tm *local_time;
         struct tm zero_tm;
@@ -92,13 +92,8 @@ int cal_main(int argc, char **argv)
         option_mask32 &= 1;
         month = 0;
         argv += optind;
-        argc -= optind;
 
-        if (argc > 2) {
-                bb_show_usage();
-        }
-
-        if (!argc) {
+        if (!argv[0]) {
                 time(&now);
                 local_time = localtime(&now);
                 year = local_time->tm_year + 1900;
@@ -106,7 +101,10 @@ int cal_main(int argc, char **argv)
                         month = local_time->tm_mon + 1;
                 }
         } else {
-                if (argc == 2) {
+                if (argv[1]) {
+                        if (argv[2]) {
+                                bb_show_usage();
+                        }
                         month = xatou_range(*argv++, 1, 12);
                 }
                 year = xatou_range(*argv, 1, 9999);
diff --git a/coreutils/hostid.c b/coreutils/hostid.c
index 6f007d847..a537e3ad6 100644
--- a/coreutils/hostid.c
+++ b/coreutils/hostid.c
@@ -14,9 +14,9 @@
 /* This is a NOFORK applet. Be very careful! */
 
 int hostid_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int hostid_main(int argc, char **argv UNUSED_PARAM)
+int hostid_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
-        if (argc > 1) {
+        if (argv[1]) {
                 bb_show_usage();
         }
 
diff --git a/coreutils/logname.c b/coreutils/logname.c
index 7e5013255..8357b9a33 100644
--- a/coreutils/logname.c
+++ b/coreutils/logname.c
@@ -25,11 +25,11 @@
 /* This is a NOFORK applet. Be very careful! */
 
 int logname_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int logname_main(int argc, char **argv UNUSED_PARAM)
+int logname_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
         char buf[64];
 
-        if (argc > 1) {
+        if (argv[1]) {
                 bb_show_usage();
         }
 
diff --git a/coreutils/nohup.c b/coreutils/nohup.c
index c9e65d2ba..4f6385f8e 100644
--- a/coreutils/nohup.c
+++ b/coreutils/nohup.c
@@ -39,7 +39,9 @@ int nohup_main(int argc UNUSED_PARAM, char **argv)
 
         xfunc_error_retval = 127;
 
-        if (!argv[1]) bb_show_usage();
+        if (!argv[1]) {
+                bb_show_usage();
+        }
 
         /* If stdin is a tty, detach from it. */
         if (isatty(STDIN_FILENO)) {
diff --git a/coreutils/uuencode.c b/coreutils/uuencode.c
index e19f99676..bf661851d 100644
--- a/coreutils/uuencode.c
+++ b/coreutils/uuencode.c
@@ -16,7 +16,7 @@ enum {
 };
 
 int uuencode_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int uuencode_main(int argc, char **argv)
+int uuencode_main(int argc UNUSED_PARAM, char **argv)
 {
         struct stat stat_buf;
         int src_fd = STDIN_FILENO;
@@ -32,7 +32,7 @@ int uuencode_main(int argc, char **argv)
                 tbl = bb_uuenc_tbl_base64;
         }
         argv += optind;
-        if (argc == optind + 2) {
+        if (argv[1]) {
                 src_fd = xopen(*argv, O_RDONLY);
                 fstat(src_fd, &stat_buf);
                 mode = stat_buf.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO);
diff --git a/coreutils/whoami.c b/coreutils/whoami.c
index 1031cdbf8..22d722ec7 100644
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -14,9 +14,9 @@
 /* This is a NOFORK applet. Be very careful! */
 
 int whoami_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int whoami_main(int argc, char **argv UNUSED_PARAM)
+int whoami_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
-        if (argc > 1)
+        if (argv[1])
                 bb_show_usage();
 
         /* Will complain and die if username not found */