lib/: sget*ent(): Remove unnecessary 'static', and rename variable

For consistency, use 'fields[]' in all these functions, and don't make it unnecessarily 'static'. Signed-off-by: Alejandro Colomar <[email protected]>
shadow-maint · Dec 9, 2024 · 8bc3413 · 8bc3413
1 parent 07fbf22
commit 8bc3413
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/lib/gshadow.c b/lib/gshadow.c
@@ -74,7 +74,7 @@ sgetsgent(const char *s)
 {
 	static char  *dup = NULL;
 
-	char *fields[FIELDS];
+	char  *fields[FIELDS];
 	char *cp;
 	int i;
 

diff --git a/lib/sgetgrent.c b/lib/sgetgrent.c
@@ -68,10 +68,11 @@ struct group *
 sgetgrent(const char *s)
 {
 	static char         *dup = NULL;
-	static char *grpfields[NFIELDS];
 	static struct group grent;
+
 	int i;
 	char *cp;
+	char  *fields[NFIELDS];
 
 	free(dup);
 	dup = strdup(s);
@@ -81,21 +82,20 @@ sgetgrent(const char *s)
 	stpsep(dup, "\n");
 
 	for (cp = dup, i = 0; (i < NFIELDS) && (NULL != cp); i++)
-		grpfields[i] = strsep(&cp, ":");
+		fields[i] = strsep(&cp, ":");
 
-	if (i < (NFIELDS - 1) || *grpfields[2] == '\0' || cp != NULL) {
+	if (i < (NFIELDS - 1) || *fields[2] == '\0' || cp != NULL) {
 		return NULL;
 	}
-	grent.gr_name = grpfields[0];
-	grent.gr_passwd = grpfields[1];
-	if (get_gid(grpfields[2], &grent.gr_gid) == -1) {
+	grent.gr_name = fields[0];
+	grent.gr_passwd = fields[1];
+	if (get_gid(fields[2], &grent.gr_gid) == -1) {
 		return NULL;
 	}
-	grent.gr_mem = list (grpfields[3]);
+	grent.gr_mem = list(fields[3]);
 	if (NULL == grent.gr_mem) {
 		return NULL;	/* out of memory */
 	}
 
 	return &grent;
 }
-
diff --git a/lib/sgetpwent.c b/lib/sgetpwent.c
@@ -43,9 +43,10 @@ sgetpwent(const char *s)
 {
 	static char          *dup = NULL;
 	static struct passwd pwent;
+
 	int i;
 	char *cp;
-	char *fields[NFIELDS];
+	char  *fields[NFIELDS];
 
 	free(dup);
 	dup = strdup(s);

diff --git a/lib/sgetspent.c b/lib/sgetspent.c
@@ -40,6 +40,7 @@ sgetspent(const char *s)
 {
 	static char        *dup = NULL;
 	static struct spwd spwd;
+
 	char *fields[FIELDS];
 	char *cp;
 	int i;