From 0663c91f80a6bc78275e9228a133f07836eeba4b Mon Sep 17 00:00:00 2001 From: Alejandro Colomar Date: Sat, 31 Aug 2024 11:37:40 +0200 Subject: [PATCH] src/: Invert logic to improve readability And remove the (now) redundant comments. Signed-off-by: Alejandro Colomar --- src/groupadd.c | 19 ++++++++----------- src/groupmod.c | 36 +++++++++++++++--------------------- 2 files changed, 23 insertions(+), 32 deletions(-) diff --git a/src/groupadd.c b/src/groupadd.c index 6db991a8..d38c4ddf 100644 --- a/src/groupadd.c +++ b/src/groupadd.c @@ -236,20 +236,17 @@ static void grp_update (void) * check_new_name() insures that the new name doesn't contain any * illegal characters. */ -static void check_new_name (void) +static void +check_new_name(void) { - if (is_valid_group_name (group_name)) { - return; + if (!is_valid_group_name(group_name)) { + fprintf(stderr, _("%s: '%s' is not a valid group name\n"), + Prog, group_name); + + exit(E_BAD_ARG); } - /* - * All invalid group names land here. - */ - - fprintf (stderr, _("%s: '%s' is not a valid group name\n"), - Prog, group_name); - - exit (E_BAD_ARG); + return; } /* diff --git a/src/groupmod.c b/src/groupmod.c index 15a673c5..0c0e29a6 100644 --- a/src/groupmod.c +++ b/src/groupmod.c @@ -351,7 +351,8 @@ static void check_new_gid (void) * check_new_name() insures that the new name does not exist already. * You can't have the same name twice, period. */ -static void check_new_name (void) +static void +check_new_name(void) { /* * Make sure they are actually changing the name. @@ -361,29 +362,22 @@ static void check_new_name (void) return; } - if (is_valid_group_name (group_newname)) { - - /* - * If the entry is found, too bad. - */ - /* local, no need for xgetgrnam */ - if (prefix_getgrnam (group_newname) != NULL) { - fprintf (stderr, - _("%s: group '%s' already exists\n"), - Prog, group_newname); - exit (E_NAME_IN_USE); - } - return; + if (!is_valid_group_name(group_newname)) { + fprintf(stderr, + _("%s: invalid group name '%s'\n"), + Prog, group_newname); + exit(E_BAD_ARG); } - /* - * All invalid group names land here. - */ + /* local, no need for xgetgrnam */ + if (prefix_getgrnam(group_newname) != NULL) { + fprintf(stderr, + _("%s: group '%s' already exists\n"), + Prog, group_newname); + exit(E_NAME_IN_USE); + } - fprintf (stderr, - _("%s: invalid group name '%s'\n"), - Prog, group_newname); - exit (E_BAD_ARG); + return; } /*