emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* libmisc/addgrps.c: Fix compilation warnings.

Browse Source
This commit is contained in:
nekral-guest 2009-03-15 21:10:35 +00:00
parent d1dac25379
commit 6aa874a0a0
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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> 2009-03-14 Nicolas François <nicolas.francois@centraliens.net>
* man/po/Makefile.in.in: xml2po cannot exclude one entity for * man/po/Makefile.in.in: xml2po cannot exclude one entity for

13
libmisc/addgrps.c
View File

@ -52,7 +52,7 @@
int add_groups (const char *list) int add_groups (const char *list)
{ {
GETGROUPS_T *grouplist, *tmp; GETGROUPS_T *grouplist, *tmp;
unsigned int i; size_t i;
int ngroups; int ngroups;
bool added; bool added;
char *token; char *token;
@ -71,7 +71,7 @@ int add_groups (const char *list)
return -1; return -1;
} }
ngroups = getgroups (i, grouplist); ngroups = getgroups (i, grouplist);
if (i > ngroups) { if ((-1 == ngroups) || (i > (size_t)ngroups)) {
break; break;
} }
/* not enough room, so try allocating a larger buffer */ /* not enough room, so try allocating a larger buffer */
@ -94,9 +94,9 @@ int add_groups (const char *list)
continue; 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; continue;
} }
@ -104,12 +104,13 @@ int add_groups (const char *list)
fputs (_("Warning: too many groups\n"), stderr); fputs (_("Warning: too many groups\n"), stderr);
break; 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) { if (NULL == tmp) {
free (grouplist); free (grouplist);
return -1; return -1;
} }
tmp[ngroups++] = grp->gr_gid; tmp[ngroups] = grp->gr_gid;
ngroups++;
grouplist = tmp; grouplist = tmp;
added = true; added = true;
} }