* src/faillog.c, src/chage.c, src/newusers.c, src/su.c: The getopt

	index of long options is not used.

diff --git a/ChangeLog b/ChangeLog
index b4e9511f9d33802ebda365b949384a84ee7cae91..b23fcba74335744bf5473204fafbda9040fbddd0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-30  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * src/faillog.c, src/chage.c, src/newusers.c, src/su.c: The getopt
+       index of long options is not used.
+
 2011-10-29  Nicolas François  <nicolas.francois@centraliens.net>
 
        * lib/prototypes.h, libmisc/Makefile.am, libmisc/root_flag.c,

diff --git a/src/chage.c b/src/chage.c
index 37a610d2337c4a86a3aab7c2fa0278a7a511c8a1..054b96dde4851279094123d84436d89a268e1b01 100644 (file)
--- a/src/chage.c
+++ b/src/chage.c
@@ -381,7 +381,6 @@ static void process_flags (int argc, char **argv)
        /*
         * Parse the command line options.
         */
-       int option_index = 0;
        int c;
        static struct option long_options[] = {
                {"lastday", required_argument, NULL, 'd'},
@@ -395,9 +394,8 @@ static void process_flags (int argc, char **argv)
                {NULL, 0, NULL, '\0'}
        };
 
-       while ((c =
-               getopt_long (argc, argv, "d:E:hI:lm:M:W:", long_options,
-                            &option_index)) != -1) {
+       while ((c = getopt_long (argc, argv, "d:E:hI:lm:M:W:",
+                                long_options, NULL)) != -1) {
                switch (c) {
                case 'd':
                        dflg = true;

diff --git a/src/faillog.c b/src/faillog.c
index 7d3aa62ec7a6be41fdd882b9130316d7c9d8674b..30e273c6b0f47d7edeb9fdd36cf419f238fad941 100644 (file)
--- a/src/faillog.c
+++ b/src/faillog.c
@@ -567,7 +567,6 @@ int main (int argc, char **argv)
        (void) textdomain (PACKAGE);
 
        {
-               int option_index = 0;
                int c;
                static struct option long_options[] = {
                        {"all", no_argument, NULL, 'a'},
@@ -580,7 +579,7 @@ int main (int argc, char **argv)
                        {NULL, 0, NULL, '\0'}
                };
                while ((c = getopt_long (argc, argv, "ahl:m:rt:u:",
-                                        long_options, &option_index)) != -1) {
+                                        long_options, NULL)) != -1) {
                        switch (c) {
                        case 'a':
                                aflg = true;

diff --git a/src/newusers.c b/src/newusers.c
index c4a59000d4f851d44c6a3b0b61e6649aeb367ca1..e0bfa226cb94c141a4ffc5c2c876568a210a0c7f 100644 (file)
--- a/src/newusers.c
+++ b/src/newusers.c
@@ -523,7 +523,6 @@ static int add_passwd (struct passwd *pwd, const char *password)
  */
 static void process_flags (int argc, char **argv)
 {
-       int option_index = 0;
        int c;
        static struct option long_options[] = {
 #ifndef USE_PAM
@@ -547,7 +546,7 @@ static void process_flags (int argc, char **argv)
 #else                          /* USE_PAM */
                                 "hr",
 #endif
-                            long_options, &option_index)) != -1) {
+                                long_options, NULL)) != -1) {
                switch (c) {
                case 'h':
                        usage (EXIT_SUCCESS);

diff --git a/src/su.c b/src/su.c
index c8815e08d776d6f9ca6e95214fea98dd28b4faaa..321a9a48c8a5f3b5019aa0e6033e610d096a073d 100644 (file)
--- a/src/su.c
+++ b/src/su.c
@@ -735,7 +735,6 @@ static void save_caller_context (char **argv)
  */
 static void process_flags (int argc, char **argv)
 {
-       int option_index = 0;
        int c;
        static struct option long_options[] = {
                {"command", required_argument, NULL, 'c'},
@@ -746,8 +745,8 @@ static void process_flags (int argc, char **argv)
                {NULL, 0, NULL, '\0'}
        };
 
-       while ((c = getopt_long (argc, argv, "c:hlmps:", long_options,
-                                &option_index)) != -1) {
+       while ((c = getopt_long (argc, argv, "c:hlmps:",
+                                long_options, NULL)) != -1) {
                switch (c) {
                case 'c':
                        command = optarg;