X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgroup-member.c;h=900c6c8469546495d276f632e6b1b9f736b27701;hb=c04bc106f2977f098ccc8a29da37af55c2d098ad;hp=f9bb8fcd4a9903689b893def59ede3769edc11c6;hpb=07910a77f2c542554338c7ca333d5ec03a09cbe3;p=gnulib.git

diff --git a/lib/group-member.c b/lib/group-member.c
index f9bb8fcd4..900c6c846 100644
--- a/lib/group-member.c
+++ b/lib/group-member.c
@@ -1,5 +1,5 @@
 /* group-member.c -- determine whether group id is in calling user's group list
-   Copyright (C) 1994 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1997, 1998, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,35 +12,26 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
-#include <config.h>
-#else
-#include "config.h"
-#endif
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif
 
 #include <stdio.h>
 #include <sys/types.h>
 
 #ifdef STDC_HEADERS
-#include <stdlib.h>
+# include <stdlib.h>
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#if HAVE_UNISTD_H
+# include <unistd.h>
 #endif
 
 #include "group-member.h"
-
-char *xmalloc ();
-char *xrealloc ();
+#include "xalloc.h"
 
 struct group_info
   {
@@ -48,18 +39,17 @@ struct group_info
     GETGROUPS_T *group;
   };
 
-#ifdef HAVE_GETGROUPS
+#if HAVE_GETGROUPS
 
 static void
-free_group_info (g)
-     struct group_info *g;
+free_group_info (struct group_info *g)
 {
   free (g->group);
   free (g);
 }
 
 static struct group_info *
-get_group_info ()
+get_group_info (void)
 {
   int n_groups;
   int n_group_slots;
@@ -77,8 +67,7 @@ get_group_info ()
   while (n_groups == n_group_slots)
     {
       n_group_slots += 64;
-      group = (GETGROUPS_T *) xrealloc (group,
-					n_group_slots * sizeof (GETGROUPS_T));
+      group = xrealloc (group, n_group_slots * sizeof (GETGROUPS_T));
       n_groups = getgroups (n_group_slots, group);
     }
 
@@ -89,7 +78,7 @@ get_group_info ()
       return NULL;
     }
 
-  gi = (struct group_info *) xmalloc (sizeof (*gi));
+  gi = xmalloc (sizeof (*gi));
   gi->n_groups = n_groups;
   gi->group = group;
 
@@ -103,8 +92,7 @@ get_group_info ()
    either of the current or effective group IDs.  */
 
 int
-group_member (gid)
-     gid_t gid;
+group_member (gid_t gid)
 {
 #ifndef HAVE_GETGROUPS
   return ((gid == getgid ()) || (gid == getegid ()));
@@ -127,7 +115,7 @@ group_member (gid)
 	  break;
 	}
     }
-  
+
   free_group_info (gi);
 
   return found;