From 281721cd15067c66b5a100622d87cb2f8c683135 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sun, 31 Aug 2008 17:28:59 +0000 Subject: [PATCH] * src/gpasswd.c: Replace the 'valid' variable by is_valid to avoid clashes with the valid() function. --- ChangeLog | 5 +++++ src/gpasswd.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 79f726d6..bb8b28b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-08-29 Nicolas François + + * src/gpasswd.c: Replace the 'valid' variable by is_valid to avoid + clashes with the valid() function. + 2008-08-29 Nicolas François * libmisc/obscure.c: Add brackets and parenthesis. diff --git a/src/gpasswd.c b/src/gpasswd.c index 78370d61..cb12fe9b 100644 --- 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)