Avoid assignments in comparisons.

diff --git a/ChangeLog b/ChangeLog
index 97c39a82652c3b452edb69abe1490fe4a2307a30..a1788ef85835bbcdb6b6a3e247223748f75d410b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
        * src/chpasswd.c: Other new functions: open_files(), close_files().
        This force flushing the password database after the password file is
        unlocked.
+       * src/chpasswd.c: Avoid assignments in comparisons.
 
 2007-12-28  Nicolas François  <nicolas.francois@centraliens.net>
 
@@ -45,7 +46,7 @@
        * libmisc/copydir.c: -1 is used to indicate an error, directly set err
        to -1, instead of incrementing it, and checking if not nul at the
        end.
-       * libmisc/copydir.c: Avoid assignment in comparisons.
+       * libmisc/copydir.c: Avoid assignments in comparisons.
        * libmisc/copydir.c: Document selinux_file_context.
        * libmisc/copydir.c: Avoid implicit brackets.
        * libmisc/copydir.c: Avoid implicit conversions to booleans.
@@ -64,7 +65,7 @@
        * src/gpasswd.c: New functions: check_perms(), get_group(),
        change_passwd(), check_flags(). Split out of main() to simplify main().
        * src/gpasswd.c: Avoid implicit brackets.
-       * src/gpasswd.c: Avoid assignment in comparisons.
+       * src/gpasswd.c: Avoid assignments in comparisons.
        * src/gpasswd.c: Avoid implicit conversions to booleans.
 
 2007-12-27  Nicolas François  <nicolas.francois@centraliens.net>

diff --git a/src/chpasswd.c b/src/chpasswd.c
index 073c79078bff8f32ed48a5a6cc1d6b6f08393d81..ff46bcce25674a1ec7ae0b374b6e2e632a1198d7 100644 (file)
--- a/src/chpasswd.c
+++ b/src/chpasswd.c
@@ -346,7 +346,8 @@ int main (int argc, char **argv)
         */
        while (fgets (buf, sizeof buf, stdin) != (char *) 0) {
                line++;
-               if ((cp = strrchr (buf, '\n'))) {
+               cp = strrchr (buf, '\n');
+               if (NULL != cp) {
                        *cp = '\0';
                } else {
                        fprintf (stderr, _("%s: line %d: line too long\n"),
@@ -365,8 +366,10 @@ int main (int argc, char **argv)
                 */
 
                name = buf;
-               if ((cp = strchr (name, ':'))) {
-                       *cp++ = '\0';
+               cp = strchr (name, ':');
+               if (NULL != cp) {
+                       *cp = '\0';
+                       cp++;
                } else {
                        fprintf (stderr,
                                 _("%s: line %d: missing new password\n"),