[Pkg-shadow-commits] r3548 - in upstream/trunk: . src

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-11-06 18:38:45 +0000 (Sun, 06 Nov 2011)
New Revision: 3548

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/chage.c
   upstream/trunk/src/faillog.c
   upstream/trunk/src/newusers.c
   upstream/trunk/src/su.c
Log:
	* src/faillog.c, src/chage.c, src/newusers.c, src/su.c: The getopt
	index of long options is not used.

Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2011-11-06 18:38:39 UTC (rev 3547)
+++ upstream/trunk/ChangeLog	2011-11-06 18:38:45 UTC (rev 3548)
@@ -1,3 +1,8 @@
+2011-10-30  Nicolas François  <nicolas.francois at 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 at centraliens.net>
 
 	* lib/prototypes.h, libmisc/Makefile.am, libmisc/root_flag.c,

Modified: upstream/trunk/src/chage.c
===================================================================
--- upstream/trunk/src/chage.c	2011-11-06 18:38:39 UTC (rev 3547)
+++ upstream/trunk/src/chage.c	2011-11-06 18:38:45 UTC (rev 3548)
@@ -381,7 +381,6 @@
 	/*
 	 * 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 @@
 		{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;

Modified: upstream/trunk/src/faillog.c
===================================================================
--- upstream/trunk/src/faillog.c	2011-11-06 18:38:39 UTC (rev 3547)
+++ upstream/trunk/src/faillog.c	2011-11-06 18:38:45 UTC (rev 3548)
@@ -567,7 +567,6 @@
 	(void) textdomain (PACKAGE);
 
 	{
-		int option_index = 0;
 		int c;
 		static struct option long_options[] = {
 			{"all", no_argument, NULL, 'a'},
@@ -580,7 +579,7 @@
 			{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;

Modified: upstream/trunk/src/newusers.c
===================================================================
--- upstream/trunk/src/newusers.c	2011-11-06 18:38:39 UTC (rev 3547)
+++ upstream/trunk/src/newusers.c	2011-11-06 18:38:45 UTC (rev 3548)
@@ -523,7 +523,6 @@
  */
 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 @@
 #else				/* USE_PAM */
 	                         "hr",
 #endif
-	                     long_options, &option_index)) != -1) {
+	                         long_options, NULL)) != -1) {
 		switch (c) {
 		case 'h':
 			usage (EXIT_SUCCESS);

Modified: upstream/trunk/src/su.c
===================================================================
--- upstream/trunk/src/su.c	2011-11-06 18:38:39 UTC (rev 3547)
+++ upstream/trunk/src/su.c	2011-11-06 18:38:45 UTC (rev 3548)
@@ -735,7 +735,6 @@
  */
 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 @@
 		{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;