* lib/idcache.c (getuser): Remove all uses of the register keyword.

[gnulib.git] / lib / idcache.c

diff --git a/lib/idcache.c b/lib/idcache.c
index b3de8bb..8e278e7 100644 (file)
--- a/lib/idcache.c
+++ b/lib/idcache.c
@@ -1,7 +1,7 @@
 /* idcache.c -- map user and group IDs, cached for speed
 
-   Copyright (C) 1985, 1988, 1989, 1990, 1997, 1998, 2003, 2005 Free
-   Software Foundation, Inc.
+   Copyright (C) 1985, 1988, 1989, 1990, 1997, 1998, 2003, 2005, 2006
+   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
@@ -17,9 +17,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -27,9 +25,7 @@
 #include <pwd.h>
 #include <grp.h>
 
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 #include "xalloc.h"
 
@@ -58,7 +54,7 @@ static struct userid *nouser_alist;
 char *
 getuser (uid_t uid)
 {
-  register struct userid *tail;
+  struct userid *tail;
   struct passwd *pwent;
 
   for (tail = user_alist; tail; tail = tail->next)
@@ -66,7 +62,7 @@ getuser (uid_t uid)
       return tail->name;
 
   pwent = getpwuid (uid);
-  tail = xmalloc (sizeof (struct userid));
+  tail = xmalloc (sizeof *tail);
   tail->id.u = uid;
   tail->name = pwent ? xstrdup (pwent->pw_name) : NULL;
 
@@ -84,7 +80,7 @@ getuser (uid_t uid)
 uid_t *
 getuidbyname (const char *user)
 {
-  register struct userid *tail;
+  struct userid *tail;
   struct passwd *pwent;
 
   for (tail = user_alist; tail; tail = tail->next)
@@ -95,7 +91,7 @@ getuidbyname (const char *user)
   for (tail = nouser_alist; tail; tail = tail->next)
     /* Avoid a function call for the most common case.  */
     if (*tail->name == *user && !strcmp (tail->name, user))
-      return 0;
+      return NULL;
 
   pwent = getpwnam (user);
 #ifdef __DJGPP__
@@ -108,7 +104,7 @@ getuidbyname (const char *user)
     }
 #endif
 
-  tail = 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.  */
@@ -122,7 +118,7 @@ getuidbyname (const char *user)
 
   tail->next = nouser_alist;
   nouser_alist = tail;
-  return 0;
+  return NULL;
 }
 
 /* Use the same struct as for userids.  */
@@ -134,7 +130,7 @@ static struct userid *nogroup_alist;
 char *
 getgroup (gid_t gid)
 {
-  register struct userid *tail;
+  struct userid *tail;
   struct group *grent;
 
   for (tail = group_alist; tail; tail = tail->next)
@@ -142,7 +138,7 @@ getgroup (gid_t gid)
       return tail->name;
 
   grent = getgrgid (gid);
-  tail = xmalloc (sizeof (struct userid));
+  tail = xmalloc (sizeof *tail);
   tail->id.g = gid;
   tail->name = grent ? xstrdup (grent->gr_name) : NULL;
 
@@ -160,7 +156,7 @@ getgroup (gid_t gid)
 gid_t *
 getgidbyname (const char *group)
 {
-  register struct userid *tail;
+  struct userid *tail;
   struct group *grent;
 
   for (tail = group_alist; tail; tail = tail->next)
@@ -171,7 +167,7 @@ getgidbyname (const char *group)
   for (tail = nogroup_alist; tail; tail = tail->next)
     /* Avoid a function call for the most common case.  */
     if (*tail->name == *group && !strcmp (tail->name, group))
-      return 0;
+      return NULL;
 
   grent = getgrnam (group);
 #ifdef __DJGPP__
@@ -184,7 +180,7 @@ getgidbyname (const char *group)
     }
 #endif
 
-  tail = 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.  */
@@ -198,5 +194,5 @@ getgidbyname (const char *group)
 
   tail->next = nogroup_alist;
   nogroup_alist = tail;
-  return 0;
+  return NULL;
 }