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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-06-09 20:09:38 +0000 (Mon, 09 Jun 2008)
New Revision: 2086

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/groupmems.c
Log:
	* src/groupmems.c: Move the declaration of option_index and
	long_options before the blocks of code.
	* src/groupmems.c: Ignore return value of setlocale(),
	bindtextdomain(), and textdomain().
	* src/groupmems.c: Ignore the return value of pam_end() before
	exiting.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-06-09 20:05:13 UTC (rev 2085)
+++ upstream/trunk/ChangeLog	2008-06-09 20:09:38 UTC (rev 2086)
@@ -1,5 +1,14 @@
 2008-06-09  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/groupmems.c: Move the declaration of option_index and
+	long_options before the blocks of code.
+	* src/groupmems.c: Ignore return value of setlocale(),
+	bindtextdomain(), and textdomain().
+	* src/groupmems.c: Ignore the return value of pam_end() before
+	exiting.
+
+2008-06-09  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* src/chfn.c: Use a bool when possible instead of int integers.
 	* src/chfn.c: Avoid implicit conversion of integers / chars to
 	booleans.

Modified: upstream/trunk/src/groupmems.c
===================================================================
--- upstream/trunk/src/groupmems.c	2008-06-09 20:05:13 UTC (rev 2085)
+++ upstream/trunk/src/groupmems.c	2008-06-09 20:09:38 UTC (rev 2086)
@@ -177,10 +177,6 @@
 	int retval;
 #endif
 
-	setlocale (LC_ALL, "");
-	bindtextdomain (PACKAGE, LOCALEDIR);
-	textdomain (PACKAGE);
-
 	int option_index = 0;
 	static struct option long_options[] = {
 		{"add", required_argument, NULL, 'a'},
@@ -191,6 +187,10 @@
 		{NULL, 0, NULL, '\0'}
 	};
 
+	(void) setlocale (LC_ALL, "");
+	(void) bindtextdomain (PACKAGE, LOCALEDIR);
+	(void) textdomain (PACKAGE);
+
 	while ((arg =
 		getopt_long (argc, argv, "a:d:g:lp", long_options,
 			     &option_index)) != EOF) {
@@ -255,14 +255,14 @@
 	if (retval == PAM_SUCCESS) {
 		retval = pam_authenticate (pamh, 0);
 		if (retval != PAM_SUCCESS) {
-			pam_end (pamh, retval);
+			(void) pam_end (pamh, retval);
 		}
 	}
 
 	if (retval == PAM_SUCCESS) {
 		retval = pam_acct_mgmt (pamh, 0);
 		if (retval != PAM_SUCCESS) {
-			pam_end (pamh, retval);
+			(void) pam_end (pamh, retval);
 		}
 	}
 
@@ -306,7 +306,7 @@
 
 #ifdef USE_PAM
 	if (retval == PAM_SUCCESS) {
-		pam_end (pamh, PAM_SUCCESS);
+		(void) pam_end (pamh, PAM_SUCCESS);
 	}
 #endif				/* USE_PAM */
 	exit (EXIT_SUCCESS);