[Pkg-shadow-commits] r2132 - in upstream/trunk: . libmisc

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-06-13 18:19:34 +0000 (Fri, 13 Jun 2008)
New Revision: 2132

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/libmisc/addgrps.c
Log:
	* libmisc/addgrps.c: Avoid implicit conversion of pointers to
	booleans.
	* libmisc/addgrps.c: Add brackets.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-06-13 18:17:10 UTC (rev 2131)
+++ upstream/trunk/ChangeLog	2008-06-13 18:19:34 UTC (rev 2132)
@@ -1,7 +1,13 @@
 2008-06-13  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* libmisc/addgrps.c: Avoid implicit conversion of pointers to
+	booleans.
+	* libmisc/addgrps.c: Add brackets.
+
+2008-06-13  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* libmisc/utmp.c: Avoid implicit conversion of pointers to
-	booleans
+	booleans.
 
 2008-06-13  Nicolas François  <nicolas.francois at centraliens.net>
 

Modified: upstream/trunk/libmisc/addgrps.c
===================================================================
--- upstream/trunk/libmisc/addgrps.c	2008-06-13 18:17:10 UTC (rev 2131)
+++ upstream/trunk/libmisc/addgrps.c	2008-06-13 18:19:34 UTC (rev 2132)
@@ -66,11 +66,13 @@
 	i = 16;
 	for (;;) {
 		grouplist = (gid_t *) malloc (i * sizeof (GETGROUPS_T));
-		if (!grouplist)
+		if (NULL == grouplist) {
 			return -1;
+		}
 		ngroups = getgroups (i, grouplist);
-		if (i > ngroups)
+		if (i > ngroups) {
 			break;
+		}
 		/* not enough room, so try allocating a larger buffer */
 		free (grouplist);
 		i *= 2;
@@ -93,8 +95,9 @@
 
 		for (i = 0; i < ngroups && grouplist[i] != grp->gr_gid; i++);
 
-		if (i < ngroups)
+		if (i < ngroups) {
 			continue;
+		}
 
 		if (ngroups >= sysconf (_SC_NGROUPS_MAX)) {
 			fputs (_("Warning: too many groups\n"), stderr);
@@ -110,8 +113,9 @@
 		added = true;
 	}
 
-	if (added)
+	if (added) {
 		return setgroups (ngroups, grouplist);
+	}
 
 	return 0;
 }