From: Alejandro Colomar <alx@kernel.org>
Date: Fri, 1 Dec 2023 23:23:06 +0000 (+0100)
Subject: lib/, src/: get_gid(): Use the usual -1 as an error code
X-Git-Tag: 4.15.0-rc1~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=470baeabbd6ef5d3f386dafed55f263fb5a90bd7;p=thirdparty%2Fshadow.git

lib/, src/: get_gid(): Use the usual -1 as an error code

Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/lib/get_gid.c b/lib/get_gid.c
index c9dcd1d0c..2c5030be3 100644
--- a/lib/get_gid.c
+++ b/lib/get_gid.c
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+
 #include <config.h>
 
 #ident "$Id$"
@@ -11,7 +12,9 @@
 #include "prototypes.h"
 #include "defines.h"
 
-int get_gid (const char *gidstr, gid_t *gid)
+
+int
+get_gid(const char *gidstr, gid_t *gid)
 {
 	long long  val;
 	char *endptr;
@@ -22,10 +25,10 @@ int get_gid (const char *gidstr, gid_t *gid)
 	    || ('\0' != *endptr)
 	    || (0 != errno)
 	    || (/*@+longintegral@*/val != (gid_t)val)/*@=longintegral@*/) {
-		return 0;
+		return -1;
 	}
 
 	*gid = val;
-	return 1;
+	return 0;
 }
 
diff --git a/lib/sgetgrent.c b/lib/sgetgrent.c
index dde755810..77587c433 100644
--- a/lib/sgetgrent.c
+++ b/lib/sgetgrent.c
@@ -105,7 +105,7 @@ struct group *sgetgrent (const char *buf)
 	}
 	grent.gr_name = grpfields[0];
 	grent.gr_passwd = grpfields[1];
-	if (get_gid (grpfields[2], &grent.gr_gid) == 0) {
+	if (get_gid(grpfields[2], &grent.gr_gid) == -1) {
 		return NULL;
 	}
 	grent.gr_mem = list (grpfields[3]);
diff --git a/lib/sgetpwent.c b/lib/sgetpwent.c
index 1c8c63e0c..5dc60bc6f 100644
--- a/lib/sgetpwent.c
+++ b/lib/sgetpwent.c
@@ -97,7 +97,7 @@ struct passwd *sgetpwent (const char *buf)
 	if (get_uid (fields[2], &pwent.pw_uid) == 0) {
 		return NULL;
 	}
-	if (get_gid (fields[3], &pwent.pw_gid) == 0) {
+	if (get_gid(fields[3], &pwent.pw_gid) == -1) {
 		return NULL;
 	}
 	pwent.pw_gecos = fields[4];
diff --git a/src/groupadd.c b/src/groupadd.c
index d06c32410..c285258d6 100644
--- a/src/groupadd.c
+++ b/src/groupadd.c
@@ -403,7 +403,7 @@ static void process_flags (int argc, char **argv)
 			break;
 		case 'g':
 			gflg = true;
-			if (   (get_gid (optarg, &group_id) == 0)
+			if (   (get_gid(optarg, &group_id) == -1)
 			    || (group_id == (gid_t)-1)) {
 				fprintf (stderr,
 				         _("%s: invalid group ID '%s'\n"),
diff --git a/src/groupmod.c b/src/groupmod.c
index 084c5d561..7c48dd4d5 100644
--- a/src/groupmod.c
+++ b/src/groupmod.c
@@ -414,7 +414,7 @@ static void process_flags (int argc, char **argv)
 			break;
 		case 'g':
 			gflg = true;
-			if (   (get_gid (optarg, &group_newid) == 0)
+			if (   (get_gid(optarg, &group_newid) == -1)
 			    || (group_newid == (gid_t)-1)) {
 				fprintf (stderr,
 				         _("%s: invalid group ID '%s'\n"),
diff --git a/src/newusers.c b/src/newusers.c
index 6eb335055..0ed7a3e09 100644
--- a/src/newusers.c
+++ b/src/newusers.c
@@ -239,7 +239,7 @@ static int add_group (const char *name, const char *gid, gid_t *ngid, uid_t uid)
 		 * new group, or an existing group.
 		 */
 
-		if (get_gid (gid, &grent.gr_gid) == 0) {
+		if (get_gid(gid, &grent.gr_gid) == -1) {
 			fprintf (stderr,
 			         _("%s: invalid group ID '%s'\n"),
 			         Prog, gid);