8 files changed, 18 insertions, 17 deletions

diff --git a/loginutils/adduser.c b/loginutils/adduser.c
index 7b5283e99..d409eabb9 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 7d47899fe..83e5e0c1f 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 06817a681..c5170c6a4 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 246bb4711..c8c54e3b9 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 a3caa0fca..79e7494bf 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 2f85e9f21..3353db1fa 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 3a1a8e9f5..caa1a8335 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 ff60d78ff..96c1f679a 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;