simplified uid() and fixed username()

diff --git a/slstatus.c b/slstatus.c
index d360977ec089d82242b053cd15b72bc237617388..7337e4a462e3d4a4c6e02cd2d0324b14aeabe8dd 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -474,40 +474,21 @@ uptime(void)
 static char *
 username(void)
 {
-       /* FIXME: WHY USE REGISTER MODIFIER? */
-       register struct passwd *pw;
-       register uid_t uid;
+       uid_t uid = geteuid();
+       struct passwd *pw = getpwuid(uid);
 
-       uid = geteuid();
-       pw = getpwuid(uid);
-
-       if (pw)
+       if (pw == NULL)
                return smprintf("%s", pw->pw_name);
-       else {
-               fprintf(stderr, "Could not get username: %s\n",
-                                       strerror(errno));
-               return smprintf(UNKNOWN_STR);
-       }
 
+       fprintf(stderr, "Could not get username: %s\n",
+                                       strerror(errno));
        return smprintf(UNKNOWN_STR);
 }
 
 static char *
 uid(void)
 {
-       /* FIXME: WHY USE register modifier? */
-       register uid_t uid;
-
-       uid = geteuid();
-
-       if (uid)
-               return smprintf("%d", uid);
-       else {
-               fprintf(stderr, "Could not get uid.\n");
-               return smprintf(UNKNOWN_STR);
-       }
-
-       return smprintf(UNKNOWN_STR);
+       return smprintf("%d", geteuid());
 }