From 69591bd017359878fd2de680ec5ba2f1218e8553 Mon Sep 17 00:00:00 2001 From: Mateusz Guzik Date: Sun, 13 Jan 2013 21:25:43 +0000 Subject: libutil: eliminate 'found' variable in gr_equal Submitted by: Christoph Mallon --- libutil/gr_util.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'libutil') diff --git a/libutil/gr_util.c b/libutil/gr_util.c index acb9767..5e35ebe 100644 --- a/libutil/gr_util.c +++ b/libutil/gr_util.c @@ -346,7 +346,6 @@ gr_equal(const struct group *gr1, const struct group *gr2) { int gr1_ndx; int gr2_ndx; - bool found; /* Check that the non-member information is the same. */ if (gr1->gr_name == NULL || gr2->gr_name == NULL) { @@ -367,17 +366,15 @@ gr_equal(const struct group *gr1, const struct group *gr2) if (gr1->gr_mem != gr2->gr_mem) return (false); } else { - for (found = false, gr1_ndx = 0; gr1->gr_mem[gr1_ndx] != NULL; - gr1_ndx++) { - for (gr2_ndx = 0; gr2->gr_mem[gr2_ndx] != NULL; - gr2_ndx++) + for (gr1_ndx = 0; gr1->gr_mem[gr1_ndx] != NULL; gr1_ndx++) { + for (gr2_ndx = 0;; gr2_ndx++) { + if (gr2->gr_mem[gr2_ndx] == NULL) + return (false); if (strcmp(gr1->gr_mem[gr1_ndx], gr2->gr_mem[gr2_ndx]) == 0) { - found = true; break; } - if (!found) - return (false); + } } /* Check that group2 does not have more members than group1. */ -- cgit v1.2.3-56-ge451