X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fidcache.c;h=2e46c1b047307af032e9654855c7fa13fbedb743;hb=04597d099c32b9b380b6c82eed97fb88ef467d2e;hp=7a827e3b004aab7200178b012563e5c3c5483049;hpb=dc078337b48469e1865fd73bd7d265b815a44de8;p=gnulib.git

diff --git a/lib/idcache.c b/lib/idcache.c
index 7a827e3b0..2e46c1b04 100644
--- a/lib/idcache.c
+++ b/lib/idcache.c
@@ -1,6 +1,7 @@
 /* idcache.c -- map user and group IDs, cached for speed
-   Copyright (C) 1985, 1988, 1989, 1990, 1997, 1998 Free Software
-   Foundation, Inc.
+
+   Copyright (C) 1985, 1988, 1989, 1990, 1997, 1998, 2003, 2005 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
@@ -14,36 +15,21 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
 #include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include <pwd.h>
 #include <grp.h>
 
-#if STDC_HEADERS || HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#ifndef _POSIX_VERSION
-struct passwd *getpwuid ();
-struct passwd *getpwnam ();
-struct group *getgrgid ();
-struct group *getgrnam ();
-#endif
+#include <unistd.h>
 
-char *xmalloc ();
-char *xstrdup ();
+#include "xalloc.h"
 
 #ifdef __DJGPP__
 static char digits[] = "0123456789";
@@ -78,7 +64,7 @@ getuser (uid_t uid)
       return tail->name;
 
   pwent = getpwuid (uid);
-  tail = (struct userid *) xmalloc (sizeof (struct userid));
+  tail = xmalloc (sizeof *tail);
   tail->id.u = uid;
   tail->name = pwent ? xstrdup (pwent->pw_name) : NULL;
 
@@ -120,7 +106,7 @@ getuidbyname (const char *user)
     }
 #endif
 
-  tail = (struct userid *) xmalloc (sizeof (struct userid));
+  tail = xmalloc (sizeof *tail);
   tail->name = xstrdup (user);
 
   /* Add to the head of the list, so most recently used is first.  */
@@ -154,7 +140,7 @@ getgroup (gid_t gid)
       return tail->name;
 
   grent = getgrgid (gid);
-  tail = (struct userid *) xmalloc (sizeof (struct userid));
+  tail = xmalloc (sizeof *tail);
   tail->id.g = gid;
   tail->name = grent ? xstrdup (grent->gr_name) : NULL;
 
@@ -196,7 +182,7 @@ getgidbyname (const char *group)
     }
 #endif
 
-  tail = (struct userid *) xmalloc (sizeof (struct userid));
+  tail = xmalloc (sizeof *tail);
   tail->name = xstrdup (group);
 
   /* Add to the head of the list, so most recently used is first.  */