* lib/shadow.c: Use SHADOW_SP_FLAG_UNSET for the initial

	value of spwd.sp_flag.
	* lib/shadow.c: Add brackets.
	* lib/shadow.c: Avoid implicit conversion of pointers to
	booleans.
	* lib/shadow.c: The size argument of fgets is an int, not a
	size_t.

diff --git a/ChangeLog b/ChangeLog
index 16d607d4e7f21f7db59eb1e0d8298c3040479eca..56aedfe688db0402f73d238624ee56a50e245e22 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-06-13  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * lib/shadow.c: Use SHADOW_SP_FLAG_UNSET for the initial
+       value of spwd.sp_flag.
+       * lib/shadow.c: Add brackets.
+       * lib/shadow.c: Avoid implicit conversion of pointers to
+       booleans.
+       * lib/shadow.c: The size argument of fgets is an int, not a
+       size_t.
+
 2008-06-13  Nicolas François  <nicolas.francois@centraliens.net>
 
        * lib/commonio.c: len should be typed ssize_t as it is the return

diff --git a/lib/shadow.c b/lib/shadow.c
index c950d790ae11658764ad9dabe2ccbbd57aab383a..0cf25c5fb3ca6f0c33ca89f9a396a7a3ab96901e 100644 (file)
--- a/lib/shadow.c
+++ b/lib/shadow.c
@@ -236,7 +236,7 @@ static struct spwd *my_sgetspent (const char *string)
 
        if (i == OFIELDS) {
                spwd.sp_warn = spwd.sp_inact = spwd.sp_expire =
-                   spwd.sp_flag = -1;
+                   spwd.sp_flag = SHADOW_SP_FLAG_UNSET;
 
                return &spwd;
        }
@@ -291,8 +291,9 @@ static struct spwd *my_sgetspent (const char *string)
 #else
                return 0;
 #endif
-       } else if (fields[7][0] == '\0')
+       } else if (fields[7][0] == '\0') {
                spwd.sp_expire = -1;
+       }
 
        /*
         * This field is reserved for future use.  But it isn't supposed
@@ -302,15 +303,17 @@ static struct spwd *my_sgetspent (const char *string)
        spwd.sp_flag = strtol (fields[8], &cpp, 10);
        if ((spwd.sp_flag == 0) && *cpp) {
 #ifdef USE_NIS
-               if (!nis_used)
+               if (!nis_used) {
                        return 0;
-               else
-                       spwd.sp_flag = -1;
+               } else {
+                       spwd.sp_flag = SHADOW_SP_FLAG_UNSET;
+               }
 #else
                return 0;
 #endif
-       } else if (fields[8][0] == '\0')
-               spwd.sp_flag = -1;
+       } else if (fields[8][0] == '\0') {
+               spwd.sp_flag = SHADOW_SP_FLAG_UNSET;
+       }
 
        return (&spwd);
 }
@@ -324,21 +327,24 @@ struct spwd *fgetspent (FILE * fp)
        char buf[BUFSIZ];
        char *cp;
 
-       if (!fp)
+       if (NULL == fp) {
                return (0);
+       }
 
 #ifdef USE_NIS
-       while (fgets (buf, sizeof buf, fp) != (char *) 0)
+       while (fgets (buf, (int) sizeof buf, fp) != (char *) 0)
 #else
-       if (fgets (buf, sizeof buf, fp) != (char *) 0)
+       if (fgets (buf, (int) sizeof buf, fp) != (char *) 0)
 #endif
        {
                cp = strchr (buf, '\n');
-               if (NULL != cp)
+               if (NULL != cp) {
                        *cp = '\0';
+               }
 #ifdef USE_NIS
-               if (nis_ignore && IS_NISCHAR (buf[0]))
+               if (nis_ignore && IS_NISCHAR (buf[0])) {
                        continue;
+               }
 #endif
                return my_sgetspent (buf);
        }