* src/gpasswd.c: Replace the 'valid' variable by is_valid to avoid

	clashes with the valid() function.

diff --git a/ChangeLog b/ChangeLog
index 79f726d60c0807dd1be65374446f878048032795..bb8b28b32e188d29b427c5a07d667f1127e59e5c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-29  Nicolas François  <nicolas.francois@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@centraliens.net>
 
        * libmisc/obscure.c: Add brackets and parenthesis.

diff --git a/src/gpasswd.c b/src/gpasswd.c
index 78370d61701ef23327afefe9ba6f9c53a8530f43..cb12fe9bc9a3044ebbaa713df7784939df7a1ab3 100644 (file)
--- a/src/gpasswd.c
+++ b/src/gpasswd.c
@@ -201,7 +201,7 @@ static bool is_valid_user_list (const char *users)
 {
        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 @@ static bool is_valid_user_list (const char *users)
                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)