[Pkg-shadow-commits] r1642 - in upstream/trunk: . lib

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-01-05 13:56:21 +0000 (Sat, 05 Jan 2008)
New Revision: 1642

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/lib/gshadow.c
Log:
The prototypes of fgetsx() and fputsx() are already defined in
prototypes.h. Remove the declaration of these functions.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-01-05 13:54:39 UTC (rev 1641)
+++ upstream/trunk/ChangeLog	2008-01-05 13:56:21 UTC (rev 1642)
@@ -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 at centraliens.net>
 

Modified: upstream/trunk/lib/gshadow.c
===================================================================
--- upstream/trunk/lib/gshadow.c	2008-01-05 13:54:39 UTC (rev 1641)
+++ upstream/trunk/lib/gshadow.c	2008-01-05 13:56:21 UTC (rev 1642)
@@ -45,9 +45,6 @@
 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 @@
 }
 #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 @@
 		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;
 }