* libmisc/addgrps.c: Fix compilation warnings.

diff --git a/ChangeLog b/ChangeLog
index 5d9473e6d5e4f6ecb623a10064e217ee97a930d7..8ced1f33ef13b776cb1f47183c013a037cb991d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-15  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * libmisc/addgrps.c: Fix compilation warnings.
+
 2009-03-14  Nicolas François  <nicolas.francois@centraliens.net>
 
        * man/po/Makefile.in.in: xml2po cannot exclude one entity for

diff --git a/libmisc/addgrps.c b/libmisc/addgrps.c
index 8958107d056df6ffd39cbfbf9989aa89400dd555..80ac01871a7583bce4628831fa621e2238626b6e 100644 (file)
--- a/libmisc/addgrps.c
+++ b/libmisc/addgrps.c
@@ -52,7 +52,7 @@
 int add_groups (const char *list)
 {
        GETGROUPS_T *grouplist, *tmp;
-       unsigned int i;
+       size_t i;
        int ngroups;
        bool added;
        char *token;
@@ -71,7 +71,7 @@ int add_groups (const char *list)
                        return -1;
                }
                ngroups = getgroups (i, grouplist);
-               if (i > ngroups) {
+               if ((-1 == ngroups) || (i > (size_t)ngroups)) {
                        break;
                }
                /* not enough room, so try allocating a larger buffer */
@@ -94,9 +94,9 @@ int add_groups (const char *list)
                        continue;
                }
 
-               for (i = 0; i < ngroups && grouplist[i] != grp->gr_gid; i++);
+               for (i = 0; i < (size_t)ngroups && grouplist[i] != grp->gr_gid; i++);
 
-               if (i < ngroups) {
+               if (i < (size_t)ngroups) {
                        continue;
                }
 
@@ -104,12 +104,13 @@ int add_groups (const char *list)
                        fputs (_("Warning: too many groups\n"), stderr);
                        break;
                }
-               tmp = (gid_t *) realloc (grouplist, (ngroups + 1) * sizeof (GETGROUPS_T));
+               tmp = (gid_t *) realloc (grouplist, (size_t)(ngroups + 1) * sizeof (GETGROUPS_T));
                if (NULL == tmp) {
                        free (grouplist);
                        return -1;
                }
-               tmp[ngroups++] = grp->gr_gid;
+               tmp[ngroups] = grp->gr_gid;
+               ngroups++;
                grouplist = tmp;
                added = true;
        }