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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2007-12-28 22:24:02 +0000 (Fri, 28 Dec 2007)
New Revision: 1541

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/chpasswd.c
Log:
Avoid assignments in comparisons.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-12-28 22:18:55 UTC (rev 1540)
+++ upstream/trunk/ChangeLog	2007-12-28 22:24:02 UTC (rev 1541)
@@ -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 at 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 at centraliens.net>

Modified: upstream/trunk/src/chpasswd.c
===================================================================
--- upstream/trunk/src/chpasswd.c	2007-12-28 22:18:55 UTC (rev 1540)
+++ upstream/trunk/src/chpasswd.c	2007-12-28 22:24:02 UTC (rev 1541)
@@ -346,7 +346,8 @@
 	 */
 	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 @@
 		 */
 
 		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"),