diff options
author | Denis Vlasenko | 2008-03-17 09:00:54 +0000 |
---|---|---|
committer | Denis Vlasenko | 2008-03-17 09:00:54 +0000 |
commit | 68404f13d4bf4826e3609703dad5375763db28ab (patch) | |
tree | b89ed41daeb3a761ac9416a6eed090023b23e7e2 /loginutils | |
parent | a55bd05f3cea6c7cbfb45d15009cb70570c2a43b (diff) | |
download | busybox-68404f13d4bf4826e3609703dad5375763db28ab.zip busybox-68404f13d4bf4826e3609703dad5375763db28ab.tar.gz |
*: add -Wunused-parameter; fix resulting breakage
function old new delta
procps_scan 1265 1298 +33
aliascmd 278 283 +5
parse_file_cmd 116 120 +4
dname_enc 373 377 +4
setcmd 90 93 +3
execcmd 57 60 +3
count_lines 72 74 +2
process_command_subs 340 339 -1
test_main 409 407 -2
mknod_main 179 177 -2
handle_incoming_and_exit 2653 2651 -2
argstr 1312 1310 -2
shiftcmd 131 128 -3
exitcmd 46 43 -3
dotcmd 297 294 -3
breakcmd 86 83 -3
evalpipe 353 349 -4
evalcommand 1180 1176 -4
evalcmd 109 105 -4
send_tree 374 369 -5
mkfifo_main 82 77 -5
evalsubshell 152 147 -5
typecmd 75 69 -6
letcmd 61 55 -6
add_cmd 1190 1183 -7
main 891 883 -8
ash_main 1415 1407 -8
parse_stream 1377 1367 -10
alloc_procps_scan 55 - -55
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 7/21 up/down: 54/-148) Total: -94 bytes
text data bss dec hex filename
797195 658 7428 805281 c49a1 busybox_old
797101 658 7428 805187 c4943 busybox_unstripped
Diffstat (limited to 'loginutils')
-rw-r--r-- | loginutils/adduser.c | 2 | ||||
-rw-r--r-- | loginutils/chpasswd.c | 2 | ||||
-rw-r--r-- | loginutils/cryptpw.c | 2 | ||||
-rw-r--r-- | loginutils/getty.c | 12 | ||||
-rw-r--r-- | loginutils/login.c | 7 | ||||
-rw-r--r-- | loginutils/passwd.c | 2 | ||||
-rw-r--r-- | loginutils/sulogin.c | 2 | ||||
-rw-r--r-- | loginutils/vlock.c | 6 |
8 files changed, 18 insertions, 17 deletions
diff --git a/loginutils/adduser.c b/loginutils/adduser.c index 7b5283e..d409eab 100644 --- a/loginutils/adduser.c +++ b/loginutils/adduser.c @@ -85,7 +85,7 @@ static const char adduser_longopts[] ALIGN1 = * can be customized via command-line parameters. */ int adduser_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int adduser_main(int argc, char **argv) +int adduser_main(int argc ATTRIBUTE_UNUSED, char **argv) { struct passwd pw; const char *usegroup = NULL; diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c index 7d47899..83e5e0c 100644 --- a/loginutils/chpasswd.c +++ b/loginutils/chpasswd.c @@ -21,7 +21,7 @@ static const char chpasswd_longopts[] ALIGN1 = #define OPT_MD5 2 int chpasswd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int chpasswd_main(int argc, char **argv) +int chpasswd_main(int argc ATTRIBUTE_UNUSED, char **argv) { char *name, *pass; char salt[sizeof("$N$XXXXXXXX")]; diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c index 06817a6..c5170c6 100644 --- a/loginutils/cryptpw.c +++ b/loginutils/cryptpw.c @@ -8,7 +8,7 @@ #include "libbb.h" int cryptpw_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int cryptpw_main(int argc, char **argv) +int cryptpw_main(int argc ATTRIBUTE_UNUSED, char **argv) { char salt[sizeof("$N$XXXXXXXX")]; diff --git a/loginutils/getty.c b/loginutils/getty.c index 246bb47..c8c54e3 100644 --- a/loginutils/getty.c +++ b/loginutils/getty.c @@ -367,7 +367,7 @@ static void auto_baud(char *buf, unsigned size_buf, struct termios *tp) } /* do_prompt - show login prompt, optionally preceded by /etc/issue contents */ -static void do_prompt(struct options *op, struct termios *tp) +static void do_prompt(struct options *op) { #ifdef ISSUE print_login_issue(op->issue, op->tty); @@ -390,7 +390,7 @@ static int all_is_upcase(const char *s) /* get_logname - get user name, establish parity, speed, erase, kill, eol; * return NULL on BREAK, logname on success */ static char *get_logname(char *logname, unsigned size_logname, - struct options *op, struct chardata *cp, struct termios *tp) + struct options *op, struct chardata *cp) { char *bp; char c; /* input character, full eight bits */ @@ -414,7 +414,7 @@ static char *get_logname(char *logname, unsigned size_logname, logname[0] = '\0'; while (!logname[0]) { /* Write issue file and prompt, with "parity" bit == 0. */ - do_prompt(op, tp); + do_prompt(op); /* Read name, watch for break, parity, erase, kill, end-of-line. */ bp = logname; @@ -621,7 +621,7 @@ static void update_utmp(const char *line, char *fakehost) #endif /* CONFIG_FEATURE_UTMP */ int getty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int getty_main(int argc, char **argv) +int getty_main(int argc ATTRIBUTE_UNUSED, char **argv) { int n; char *fakehost = NULL; /* Fake hostname for ut_host */ @@ -670,7 +670,7 @@ int getty_main(int argc, char **argv) #ifdef DEBUGGING dbf = xfopen(DEBUGTERM, "w"); - for (n = 1; n < argc; n++) { + for (n = 1; argv[n]; n++) { debug(argv[n]); debug("\n"); } @@ -750,7 +750,7 @@ int getty_main(int argc, char **argv) /* Read the login name. */ debug("reading login name\n"); logname = get_logname(line_buf, sizeof(line_buf), - &options, &chardata, &termios); + &options, &chardata); if (logname) break; /* we are here only if options.numspeed > 1 */ diff --git a/loginutils/login.c b/loginutils/login.c index a3caa0f..79e7494 100644 --- a/loginutils/login.c +++ b/loginutils/login.c @@ -114,7 +114,7 @@ static void write_utent(struct utmp *utptr, const char *username) #endif /* !ENABLE_FEATURE_UTMP */ #if ENABLE_FEATURE_NOLOGIN -static void die_if_nologin_and_non_root(int amroot) +static void die_if_nologin(void) { FILE *fp; int c; @@ -135,7 +135,7 @@ static void die_if_nologin_and_non_root(int amroot) puts("\r\n[Disconnect bypassed -- root login allowed]\r"); } #else -static ALWAYS_INLINE void die_if_nologin_and_non_root(int amroot) {} +static ALWAYS_INLINE void die_if_nologin(void) {} #endif #if ENABLE_FEATURE_SECURETTY && !ENABLE_PAM @@ -406,7 +406,8 @@ int login_main(int argc, char **argv) } alarm(0); - die_if_nologin_and_non_root(pw->pw_uid == 0); + if (!amroot) + die_if_nologin(); write_utent(&utent, username); diff --git a/loginutils/passwd.c b/loginutils/passwd.c index 2f85e9f..3353db1 100644 --- a/loginutils/passwd.c +++ b/loginutils/passwd.c @@ -70,7 +70,7 @@ static char* new_password(const struct passwd *pw, uid_t myuid, int algo) } int passwd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int passwd_main(int argc, char **argv) +int passwd_main(int argc ATTRIBUTE_UNUSED, char **argv) { enum { OPT_algo = 0x1, /* -a - password algorithm */ diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c index 3a1a8e9..caa1a83 100644 --- a/loginutils/sulogin.c +++ b/loginutils/sulogin.c @@ -15,7 +15,7 @@ int sulogin_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int sulogin_main(int argc, char **argv) +int sulogin_main(int argc ATTRIBUTE_UNUSED, char **argv) { char *cp; int timeout = 0; diff --git a/loginutils/vlock.c b/loginutils/vlock.c index ff60d78..96c1f67 100644 --- a/loginutils/vlock.c +++ b/loginutils/vlock.c @@ -18,21 +18,21 @@ #include <sys/vt.h> #include "libbb.h" -static void release_vt(int signo) +static void release_vt(int signo ATTRIBUTE_UNUSED) { /* If -a, param is 0, which means: * "no, kernel, we don't allow console switch away from us!" */ ioctl(STDIN_FILENO, VT_RELDISP, (unsigned long) !option_mask32); } -static void acquire_vt(int signo) +static void acquire_vt(int signo ATTRIBUTE_UNUSED) { /* ACK to kernel that switch to console is successful */ ioctl(STDIN_FILENO, VT_RELDISP, VT_ACKACQ); } int vlock_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int vlock_main(int argc, char **argv) +int vlock_main(int argc ATTRIBUTE_UNUSED, char **argv) { struct vt_mode vtm; struct termios term; |