emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*: remove some uses of argc

Browse Source 
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>
This commit is contained in:
Denys Vlasenko
2010-01-04 14:15:38 +01:00
parent a355da0775
commit 2ec91aead5
26 changed files with 77 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
coreutils/cal.c
View File

@ -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);

4
coreutils/hostid.c
View File

@ -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();
}

4
coreutils/logname.c
View File

@ -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();
}

4
coreutils/nohup.c
View File

@ -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)) {

4
coreutils/uuencode.c
View File

@ -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);

4
coreutils/whoami.c
View File

@ -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 */