From 0ffbe10b815970d65a95cc7a1806fa62b8f5a6a3 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 27 Feb 2020 18:04:47 +0900 Subject: [PATCH 1/2] userdb: drop unnecessary goto --- src/shared/userdb.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/shared/userdb.c b/src/shared/userdb.c index 1f05cda26a..be9af7e8ae 100644 --- a/src/shared/userdb.c +++ b/src/shared/userdb.c @@ -699,11 +699,9 @@ int userdb_all(UserDBFlags flags, UserDBIterator **ret) { setpwent(); iterator->nss_iterating = true; - goto finish; } else if (r < 0) return r; -finish: *ret = TAKE_PTR(iterator); return 0; } From 443876d8dcf3a8cf9abbb04a23a288bf9fc3b7f0 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 27 Feb 2020 18:05:14 +0900 Subject: [PATCH 2/2] userdb: make groupdb_all() always set iterator when it returns >= 0 --- src/shared/userdb.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/shared/userdb.c b/src/shared/userdb.c index be9af7e8ae..63599e7141 100644 --- a/src/shared/userdb.c +++ b/src/shared/userdb.c @@ -903,15 +903,9 @@ int groupdb_all(UserDBFlags flags, UserDBIterator **ret) { setgrent(); iterator->nss_iterating = true; - goto finish; - } + } if (r < 0) + return r; - if (!FLAGS_SET(flags, USERDB_DONT_SYNTHESIZE)) - goto finish; - - return r; - -finish: *ret = TAKE_PTR(iterator); return 0; }