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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-05-25 22:03:09 +0000 (Sun, 25 May 2008)
New Revision: 2025

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/libmisc/addgrps.c
Log:
* Change type of added to bool.
* Avoid implicit conversion of pointers to booleans.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-05-25 21:52:14 UTC (rev 2024)
+++ upstream/trunk/ChangeLog	2008-05-25 22:03:09 UTC (rev 2025)
@@ -1,5 +1,11 @@
 2008-05-25  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* libmisc/addgrps.c: Change type of added to bool.
+	* libmisc/addgrps.c: Avoid implicit conversion of pointers to
+	booleans.
+
+2008-05-25  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* libmisc/hushed.c: hushed returns a bool instead of int.
 	* libmisc/hushed.c: Avoid assignments in comparisons.
 	* libmisc/hushed.c (hushed): Change type of found to bool.

Modified: upstream/trunk/libmisc/addgrps.c
===================================================================
--- upstream/trunk/libmisc/addgrps.c	2008-05-25 21:52:14 UTC (rev 2024)
+++ upstream/trunk/libmisc/addgrps.c	2008-05-25 22:03:09 UTC (rev 2025)
@@ -52,7 +52,8 @@
 int add_groups (const char *list)
 {
 	GETGROUPS_T *grouplist, *tmp;
-	int i, ngroups, added;
+	int i, ngroups;
+	bool added;
 	char *token;
 	char buf[1024];
 
@@ -79,12 +80,12 @@
 		return -1;
 	}
 
-	added = 0;
-	for (token = strtok (buf, SEP); token; token = strtok (NULL, SEP)) {
+	added = false;
+	for (token = strtok (buf, SEP); NULL != token; token = strtok (NULL, SEP)) {
 		struct group *grp;
 
 		grp = getgrnam (token); /* local, no need for xgetgrnam */
-		if (!grp) {
+		if (NULL == grp) {
 			fprintf (stderr, _("Warning: unknown group %s\n"),
 				 token);
 			continue;
@@ -100,13 +101,13 @@
 			break;
 		}
 		tmp = (gid_t *) realloc (grouplist, (ngroups + 1) * sizeof (GETGROUPS_T));
-		if (!tmp) {
+		if (NULL == tmp) {
 			free (grouplist);
 			return -1;
 		}
 		tmp[ngroups++] = grp->gr_gid;
 		grouplist = tmp;
-		added++;
+		added = true;
 	}
 
 	if (added)