From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Sat, 5 Jan 2008 13:56:21 +0000 (+0000)
Subject: The prototypes of fgetsx() and fputsx() are already defined in
X-Git-Tag: 4.1.1~141
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d9c39789bd74d610506e6c12d78842f498fecaf;p=thirdparty%2Fshadow.git

The prototypes of fgetsx() and fputsx() are already defined in
prototypes.h. Remove the declaration of these functions.
---

diff --git a/ChangeLog b/ChangeLog
index 72fe07613..1ca93c078 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,9 @@
 	loginprompt for the internal variable.
 	* src/chsh.c: loginsh is a global variable, use newshell for the
 	update_shell()'s parameter.
+	* lib/gshadow.c: The prototypes of fgetsx() and fputsx() are
+	already defined in prototypes.h. Remove the declaration of these
+	functions.
 
 2008-01-01  Nicolas François  <nicolas.francois@centraliens.net>
 
diff --git a/lib/gshadow.c b/lib/gshadow.c
index 5d4080476..5f45eb53f 100644
--- a/lib/gshadow.c
+++ b/lib/gshadow.c
@@ -45,9 +45,6 @@ static char **admins = NULL;
 static size_t nadmins = 0;
 static struct sgrp sgroup;
 
-extern char *fgetsx ();
-extern int fputsx ();
-
 #define	FIELDS	4
 
 #ifdef	USE_NIS
@@ -92,7 +89,7 @@ static int bind_nis (void)
 }
 #endif
 
-static char **list (char *s, char **list[], size_t * nlist)
+static char **build_list (char *s, char **list[], size_t * nlist)
 {
 	char **ptr = *list;
 	size_t nelem = *nlist, size;
@@ -184,8 +181,8 @@ struct sgrp *sgetsgent (const char *string)
 		free (members);
 		members = NULL;
 	}
-	sgroup.sg_adm = list (fields[2], &admins, &nadmins);
-	sgroup.sg_mem = list (fields[3], &members, &nmembers);
+	sgroup.sg_adm = build_list (fields[2], &admins, &nadmins);
+	sgroup.sg_mem = build_list (fields[3], &members, &nmembers);
 
 	return &sgroup;
 }