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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-01-06 13:38:16 +0000 (Sun, 06 Jan 2008)
New Revision: 1671

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/lib/groupio.c
Log:
* Remove prototype for sgetgrent().
* Add the name of the parameters for merge_group_entries() and split_groups().


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-01-06 13:32:25 UTC (rev 1670)
+++ upstream/trunk/ChangeLog	2008-01-06 13:38:16 UTC (rev 1671)
@@ -115,6 +115,9 @@
 	__gr_get_head(), __sgr_del_entry(), and __sgr_get_head().
 	* src/pwck.c: Remove prototypes for __pw_del_entry(),
 	__pw_get_head(), __spw_del_entry(), and __spw_get_head().
+	* lib/groupio.c: Remove prototype for sgetgrent().
+	* lib/groupio.c: Add the name of the parameters for
+	merge_group_entries() and split_groups().
 
 2008-01-05  Nicolas François  <nicolas.francois at centraliens.net>
 

Modified: upstream/trunk/lib/groupio.c
===================================================================
--- upstream/trunk/lib/groupio.c	2008-01-06 13:32:25 UTC (rev 1670)
+++ upstream/trunk/lib/groupio.c	2008-01-06 13:38:16 UTC (rev 1671)
@@ -9,11 +9,9 @@
 #include "getdef.h"
 #include "groupio.h"
 
-extern struct group *sgetgrent (const char *buf);
-
-static struct commonio_entry *merge_group_entries (struct commonio_entry *,
-                                                   struct commonio_entry *);
-static int split_groups (unsigned int);
+static struct commonio_entry *merge_group_entries (struct commonio_entry *gr1,
+                                                   struct commonio_entry *gr2);
+static int split_groups (unsigned int max_members);
 static int group_open_hook (void);
 
 static void *group_dup (const void *ent)