From 2ec91aead52d6ea6a42420005119ebb281a76cdc Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 4 Jan 2010 14:15:38 +0100 Subject: *: 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 --- miscutils/last.c | 4 ++-- miscutils/readahead.c | 6 ++++-- miscutils/ttysize.c | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) (limited to 'miscutils') diff --git a/miscutils/last.c b/miscutils/last.c index f8c301395..6e3ed9093 100644 --- a/miscutils/last.c +++ b/miscutils/last.c @@ -35,7 +35,7 @@ #endif int last_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int last_main(int argc, char **argv UNUSED_PARAM) +int last_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) { struct utmp ut; int n, file = STDIN_FILENO; @@ -56,7 +56,7 @@ int last_main(int argc, char **argv UNUSED_PARAM) TYPE_OLD_TIME /* OLD_TIME, 4 */ }; - if (argc > 1) { + if (argv[1]) { bb_show_usage(); } file = xopen(bb_path_wtmp_file, O_RDONLY); diff --git a/miscutils/readahead.c b/miscutils/readahead.c index fb71ce85f..f3b21a2fc 100644 --- a/miscutils/readahead.c +++ b/miscutils/readahead.c @@ -13,11 +13,13 @@ #include "libbb.h" int readahead_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int readahead_main(int argc, char **argv) +int readahead_main(int argc UNUSED_PARAM, char **argv) { int retval = EXIT_SUCCESS; - if (argc == 1) bb_show_usage(); + if (!argv[1]) { + bb_show_usage(); + } while (*++argv) { int fd = open_or_warn(*argv, O_RDONLY); diff --git a/miscutils/ttysize.c b/miscutils/ttysize.c index 05455543d..ca9a2ec8d 100644 --- a/miscutils/ttysize.c +++ b/miscutils/ttysize.c @@ -12,7 +12,7 @@ #include "libbb.h" int ttysize_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int ttysize_main(int argc, char **argv) +int ttysize_main(int argc UNUSED_PARAM, char **argv) { unsigned w, h; struct winsize wsz; @@ -24,7 +24,7 @@ int ttysize_main(int argc, char **argv) h = wsz.ws_row; } - if (argc == 1) { + if (!argv[1]) { printf("%u %u", w, h); } else { const char *fmt, *arg; -- cgit v1.2.3