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

diff --git a/lib/idcache.c b/lib/idcache.c
index 7a827e3b0..8b85f07c3 100644
--- a/lib/idcache.c
+++ b/lib/idcache.c
@@ -1,5 +1,5 @@
 /* idcache.c -- map user and group IDs, cached for speed
-   Copyright (C) 1985, 1988, 1989, 1990, 1997, 1998 Free Software
+   Copyright (C) 1985, 1988, 1989, 1990, 1997, 1998, 2003 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -21,20 +21,17 @@
 #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
 
+#include "xalloc.h"
+
 #ifndef _POSIX_VERSION
 struct passwd *getpwuid ();
 struct passwd *getpwnam ();
@@ -42,9 +39,6 @@ struct group *getgrgid ();
 struct group *getgrnam ();
 #endif
 
-char *xmalloc ();
-char *xstrdup ();
-
 #ifdef __DJGPP__
 static char digits[] = "0123456789";
 #endif
@@ -78,7 +72,7 @@ getuser (uid_t uid)
       return tail->name;
 
   pwent = getpwuid (uid);
-  tail = (struct userid *) xmalloc (sizeof (struct userid));
+  tail = xmalloc (sizeof (struct userid));
   tail->id.u = uid;
   tail->name = pwent ? xstrdup (pwent->pw_name) : NULL;
 
@@ -120,7 +114,7 @@ getuidbyname (const char *user)
     }
 #endif
 
-  tail = (struct userid *) xmalloc (sizeof (struct userid));
+  tail = xmalloc (sizeof (struct userid));
   tail->name = xstrdup (user);
 
   /* Add to the head of the list, so most recently used is first.  */
@@ -154,7 +148,7 @@ getgroup (gid_t gid)
       return tail->name;
 
   grent = getgrgid (gid);
-  tail = (struct userid *) xmalloc (sizeof (struct userid));
+  tail = xmalloc (sizeof (struct userid));
   tail->id.g = gid;
   tail->name = grent ? xstrdup (grent->gr_name) : NULL;
 
@@ -196,7 +190,7 @@ getgidbyname (const char *group)
     }
 #endif
 
-  tail = (struct userid *) xmalloc (sizeof (struct userid));
+  tail = xmalloc (sizeof (struct userid));
   tail->name = xstrdup (group);
 
   /* Add to the head of the list, so most recently used is first.  */