From f6701d3efa40dd47ff3ab4809dbd4012eb4ce936 Mon Sep 17 00:00:00 2001 From: Alejandro Colomar Date: Fri, 1 Dec 2023 18:57:31 +0100 Subject: [PATCH] lib/prefix_flag.c: Invert conditional to remove a branch This simplifies the code, and is preparation for a following commit. Signed-off-by: Alejandro Colomar --- lib/prefix_flag.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/lib/prefix_flag.c b/lib/prefix_flag.c index 74500ba6d..7c2afe626 100644 --- a/lib/prefix_flag.c +++ b/lib/prefix_flag.c @@ -345,18 +345,19 @@ extern struct group *prefix_getgr_nam_gid(const char *grname) return NULL; } - if (group_db_file) { - errno = 0; - gid = strtoll (grname, &endptr, 10); - if ( ('\0' != *grname) - && ('\0' == *endptr) - && (ERANGE != errno) - && (gid == (gid_t)gid)) { - return prefix_getgrgid (gid); - } - g = prefix_getgrnam (grname); - return g ? __gr_dup(g) : NULL; - } - else + if (!group_db_file) return getgr_nam_gid(grname); + + errno = 0; + gid = strtoll(grname, &endptr, 10); + if ( ('\0' != *grname) + && ('\0' == *endptr) + && (ERANGE != errno) + && (gid == (gid_t)gid)) + { + return prefix_getgrgid(gid); + } + + g = prefix_getgrnam(grname); + return g ? __gr_dup(g) : NULL; } -- 2.47.2