[Pkg-shadow-commits] r2053 - in upstream/trunk: . lib

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-05-26 01:07:13 +0000 (Mon, 26 May 2008)
New Revision: 2053

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/lib/encrypt.c
Log:
	* lib/encrypt.c: Avoid implicit conversion of pointers to booleans.
	* lib/encrypt.c: Add parenthesis.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-05-26 01:05:04 UTC (rev 2052)
+++ upstream/trunk/ChangeLog	2008-05-26 01:07:13 UTC (rev 2053)
@@ -1,5 +1,11 @@
 2008-05-26  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* lib/encrypt.c: Avoid implicit conversion of pointers to
+	booleans.
+	* lib/encrypt.c: Add parenthesis.
+
+2008-05-26  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* lib/port.c: Avoid implicit conversion of pointers / integers /
 	chars to booleans.
 	* lib/port.c: Avoid multiple statement on the same line.

Modified: upstream/trunk/lib/encrypt.c
===================================================================
--- upstream/trunk/lib/encrypt.c	2008-05-26 01:05:04 UTC (rev 2052)
+++ upstream/trunk/lib/encrypt.c	2008-05-26 01:07:13 UTC (rev 2053)
@@ -58,7 +58,7 @@
 
 	/* The GNU crypt does not return NULL if the algorithm is not
 	 * supported, and return a DES encrypted password. */
-	if (salt && salt[0] == '$' && strlen (cp) <= 13)
+	if ((NULL != salt) && (salt[0] == '$') && (strlen (cp) <= 13))
 	{
 		const char *method;
 		switch (salt[1])
@@ -91,3 +91,4 @@
 
 	return cipher;
 }
+