]> git.ipfire.org Git - thirdparty/shadow.git/commitdiff
lib/prefix_flag.c: Invert conditional to remove a branch
authorAlejandro Colomar <alx@kernel.org>
Fri, 1 Dec 2023 17:57:31 +0000 (18:57 +0100)
committerIker Pedrosa <ikerpedrosam@gmail.com>
Mon, 4 Dec 2023 11:21:55 +0000 (12:21 +0100)
This simplifies the code, and is preparation for a following commit.

Signed-off-by: Alejandro Colomar <alx@kernel.org>
lib/prefix_flag.c

index 74500ba6d80786c3ff6ade1d798b5c906ac5f374..7c2afe626d50667bf6eb21f5b5a76a14a951b962 100644 (file)
@@ -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;
 }