From 6099bda088f51851fa3f820d8bb5844fadea78aa Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Fri, 13 Jun 2008 18:19:34 +0000 Subject: [PATCH] * libmisc/addgrps.c: Avoid implicit conversion of pointers to booleans. * libmisc/addgrps.c: Add brackets. --- ChangeLog | 8 +++++++- libmisc/addgrps.c | 12 ++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index cd0e1599..a540359d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,13 @@ +2008-06-13 Nicolas François + + * libmisc/addgrps.c: Avoid implicit conversion of pointers to + booleans. + * libmisc/addgrps.c: Add brackets. + 2008-06-13 Nicolas François * libmisc/utmp.c: Avoid implicit conversion of pointers to - booleans + booleans. 2008-06-13 Nicolas François diff --git a/libmisc/addgrps.c b/libmisc/addgrps.c index ee0f6439..0c75ee82 100644 --- a/libmisc/addgrps.c +++ b/libmisc/addgrps.c @@ -66,11 +66,13 @@ int add_groups (const char *list) 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 @@ int add_groups (const char *list) 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 @@ int add_groups (const char *list) added = true; } - if (added) + if (added) { return setgroups (ngroups, grouplist); + } return 0; } -- 2.40.0