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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-08-31 17:28:59 +0000 (Sun, 31 Aug 2008)
New Revision: 2321

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/gpasswd.c
Log:
	* src/gpasswd.c: Replace the 'valid' variable by is_valid to avoid
	clashes with the valid() function.

Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-08-31 17:28:49 UTC (rev 2320)
+++ upstream/trunk/ChangeLog	2008-08-31 17:28:59 UTC (rev 2321)
@@ -1,5 +1,10 @@
 2008-08-29  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/gpasswd.c: Replace the 'valid' variable by is_valid to avoid
+	clashes with the valid() function.
+
+2008-08-29  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* libmisc/obscure.c: Add brackets and parenthesis.
 	* libmisc/obscure.c: Avoid implicit conversion of pointers / chars to
 	booleans.

Modified: upstream/trunk/src/gpasswd.c
===================================================================
--- upstream/trunk/src/gpasswd.c	2008-08-31 17:28:49 UTC (rev 2320)
+++ upstream/trunk/src/gpasswd.c	2008-08-31 17:28:59 UTC (rev 2321)
@@ -201,7 +201,7 @@
 {
 	const char *start, *end;
 	char username[32];
-	bool valid = true;
+	bool is_valid = true;
 	size_t len;
 
 	for (start = users; (NULL != start) && ('\0' != *start); start = end) {
@@ -227,10 +227,10 @@
 		if (getpwnam (username) == NULL) {
 			fprintf (stderr, _("%s: user '%s' does not exist\n"),
 			         Prog, username);
-			valid = false;
+			is_valid = false;
 		}
 	}
-	return valid;
+	return is_valid;
 }
 
 static void failure (void)