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 --- networking/ifconfig.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'networking/ifconfig.c') diff --git a/networking/ifconfig.c b/networking/ifconfig.c index 863d6e44a..1e960d45c 100644 --- a/networking/ifconfig.c +++ b/networking/ifconfig.c @@ -260,7 +260,7 @@ static int in_ether(const char *bufp, struct sockaddr *sap); * Our main function. */ int ifconfig_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int ifconfig_main(int argc, char **argv) +int ifconfig_main(int argc UNUSED_PARAM, char **argv) { struct ifreq ifr; struct sockaddr_in sai; @@ -291,19 +291,17 @@ int ifconfig_main(int argc, char **argv) /* skip argv[0] */ ++argv; - --argc; #if ENABLE_FEATURE_IFCONFIG_STATUS - if (argc > 0 && (argv[0][0] == '-' && argv[0][1] == 'a' && !argv[0][2])) { + if (argv[0] && (argv[0][0] == '-' && argv[0][1] == 'a' && !argv[0][2])) { interface_opt_a = 1; - --argc; ++argv; } #endif - if (argc <= 1) { + if (!argv[0] || !argv[1]) { /* one or no args */ #if ENABLE_FEATURE_IFCONFIG_STATUS - return display_interfaces(argc ? *argv : NULL); + return display_interfaces(argv[0] /* can be NULL */); #else bb_error_msg_and_die("no support for status display"); #endif -- cgit v1.2.3