X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgroup-member.c;h=8823506b0f722b26c09e3cd508c5eb43d2a68bac;hb=265465e1145409720be48d30b6277a59151d293a;hp=065f4d8bb9537c1b6fe2a5869402d8dd7d2ea37e;hpb=a65209cba81b9744414abd12c856bc918cde8218;p=gnulib.git

diff --git a/lib/group-member.c b/lib/group-member.c
index 065f4d8bb..8823506b0 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, 1997 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
@@ -15,25 +15,21 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H
 # include <config.h>
 #endif
 
+#include "group-member.h"
+
 #include <stdio.h>
 #include <sys/types.h>
+#include <stdlib.h>
 
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 
-#include "group-member.h"
-
-char *xmalloc ();
-char *xrealloc ();
+#include "xalloc.h"
 
 struct group_info
   {
@@ -41,7 +37,7 @@ struct group_info
     GETGROUPS_T *group;
   };
 
-#ifdef HAVE_GETGROUPS
+#if HAVE_GETGROUPS
 
 static void
 free_group_info (struct group_info *g)
@@ -69,8 +65,7 @@ get_group_info (void)
   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);
     }
 
@@ -81,7 +76,7 @@ get_group_info (void)
       return NULL;
     }
 
-  gi = (struct group_info *) xmalloc (sizeof (*gi));
+  gi = xmalloc (sizeof (*gi));
   gi->n_groups = n_groups;
   gi->group = group;
 
@@ -130,7 +125,7 @@ group_member (gid_t gid)
 char *program_name;
 
 int
-main (int argc, char** argv)
+main (int argc, char **argv)
 {
   int i;