aboutsummaryrefslogtreecommitdiff
path: root/libshouldbeinlibc/idvec.c
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2012-07-01 02:20:08 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2012-07-01 02:20:08 +0000
commit953c525d7589178629f3e91e4bf4ea805a92a5b4 (patch)
tree9411cddbd2f213fe4edf2150e2e8b02a9d27b4bf /libshouldbeinlibc/idvec.c
parent13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (diff)
parent5430151902aa7cb17458c0d71722a05fd379babf (diff)
downloadhurd-953c525d7589178629f3e91e4bf4ea805a92a5b4.tar.gz
hurd-953c525d7589178629f3e91e4bf4ea805a92a5b4.tar.bz2
hurd-953c525d7589178629f3e91e4bf4ea805a92a5b4.zip
Merge branch 'master' into xkb
Conflicts: console-client/Makefile
Diffstat (limited to 'libshouldbeinlibc/idvec.c')
-rw-r--r--libshouldbeinlibc/idvec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libshouldbeinlibc/idvec.c b/libshouldbeinlibc/idvec.c
index 24adeb8f..d18871f9 100644
--- a/libshouldbeinlibc/idvec.c
+++ b/libshouldbeinlibc/idvec.c
@@ -184,7 +184,7 @@ idvec_merge_ids (struct idvec *idvec, const uid_t *ids, unsigned num)
unsigned num_old = idvec->num;
while (num-- > 0 && !err)
{
- int i;
+ unsigned int i;
for (i = 0; i < num_old; i++)
if (idvec->ids[i] == *ids)
break;
@@ -234,7 +234,7 @@ idvec_remove (struct idvec *idvec, unsigned pos, uid_t id)
int
idvec_subtract (struct idvec *idvec, const struct idvec *sub)
{
- int i;
+ unsigned int i;
int done = 0;
for (i = 0; i < sub->num; i++)
done |= idvec_remove (idvec, 0, sub->ids[i]);