diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-04 14:15:38 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-04 14:15:38 +0100 |
| commit | 2ec91aead52d6ea6a42420005119ebb281a76cdc (patch) | |
| tree | 115804c56ff172f96c0138bcabcc7d5e56e5dae0 /coreutils/cal.c | |
| parent | a355da07756e529c112249653ed5af0e2d910728 (diff) | |
| download | busybox-2ec91aead52d6ea6a42420005119ebb281a76cdc.tar.gz | |
*: 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>
Diffstat (limited to 'coreutils/cal.c')
| -rw-r--r-- | coreutils/cal.c | 14 |
1 files changed, 6 insertions, 8 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); |