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 <alx@kernel.org>

diff --git a/lib/gshadow.c b/lib/gshadow.c
index efb04629918dfd64a2dcc44ffb60b6cf4dc752e6..9e9e251002323221c314b45fdc528c764afcffcf 100644 (file)
--- a/lib/gshadow.c
+++ b/lib/gshadow.c
@@ -73,7 +73,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
index da5601ffc5dc0daf2b8c91ac631eed1689ffe86b..8d675a3fed19cd88d4dd445889c8a52b3f4e760a 100644 (file)
--- a/lib/sgetgrent.c
+++ b/lib/sgetgrent.c
@@ -69,10 +69,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);
@@ -82,21 +83,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 || streq(grpfields[2], "") || cp != NULL) {
+       if (i < NFIELDS || streq(fields[2], "") || 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
index 691979a193c65e9df012e84d29dd13faffb5670d..7ece4dccbae34b93a4551d35c369b0e7ff645bec 100644 (file)
--- a/lib/sgetpwent.c
+++ b/lib/sgetpwent.c
@@ -44,9 +44,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
index e2d247d82a89434d47943457d8515afe009dd96c..8a19e8d82532993d1bf79b8c36c4f6d63aa1de53 100644 (file)
--- a/lib/sgetspent.c
+++ b/lib/sgetspent.c
@@ -41,6 +41,7 @@ sgetspent(const char *s)
 {
        static char        *dup = NULL;
        static struct spwd spwd;
+
        char *fields[FIELDS];
        char *cp;
        int i;