diff options
author | mjg <mjg@FreeBSD.org> | 2013-01-13 21:25:43 +0000 |
---|---|---|
committer | mjg <mjg@FreeBSD.org> | 2013-01-13 21:25:43 +0000 |
commit | 15b9700547d6667a4e855e30cc7aaf11a2a9908a (patch) | |
tree | d32ae9101f76cb4914663359683c9f406b9f260b | |
parent | 84e42b7805c39027d2cbba2feea857fc032abcc5 (diff) | |
download | FreeBSD-src-15b9700547d6667a4e855e30cc7aaf11a2a9908a.zip FreeBSD-src-15b9700547d6667a4e855e30cc7aaf11a2a9908a.tar.gz |
libutil: eliminate 'found' variable in gr_equal
Submitted by: Christoph Mallon <christoph.mallon gmx.de>
-rw-r--r-- | lib/libutil/gr_util.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lib/libutil/gr_util.c b/lib/libutil/gr_util.c index acb9767..5e35ebe 100644 --- a/lib/libutil/gr_util.c +++ b/lib/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. */ |