]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
newgrp: simplify if else clauses
authorSami Kerola <kerolasa@iki.fi>
Sat, 20 Dec 2014 12:23:06 +0000 (12:23 +0000)
committerSami Kerola <kerolasa@iki.fi>
Mon, 5 Jan 2015 22:53:01 +0000 (22:53 +0000)
The 'if' clauses that have termination as either of the control flow
results will never need 'else'.  Making the termination to happen true
flow is enough.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
login-utils/newgrp.c

index 58c9078eb1c67d4d13d1223cdeeffae3b723c664..3f5c720286936c34a172ce5b436fede0f0cc2d67 100644 (file)
@@ -214,15 +214,12 @@ int main(int argc, char *argv[])
                        if (errno)
                                err(EXIT_FAILURE, _("no such group"));
                        else
-                               /* No group */
                                errx(EXIT_FAILURE, _("no such group"));
-               } else {
-                       if (allow_setgid(pw_entry, gr_entry)) {
-                               if (setgid(gr_entry->gr_gid) < 0)
-                                       err(EXIT_FAILURE, _("setgid failed"));
-                       } else
-                               errx(EXIT_FAILURE, _("permission denied"));
                }
+               if (!allow_setgid(pw_entry, gr_entry))
+                       errx(EXIT_FAILURE, _("permission denied"));
+               if (setgid(gr_entry->gr_gid) < 0)
+                       err(EXIT_FAILURE, _("setgid failed"));
        }
 
        if (setuid(getuid()) < 0)