username(): get rid of unneeded uid variable

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 90b4808..5500a62 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -449,7 +449,7 @@ run_command(const char *cmd)
        }
        fgets(buf, sizeof(buf), fp);
        pclose(fp);
-       buf[sizeof(buf)] = '\0';
+       buf[sizeof(buf) - 1] = '\0';
 
        if ((nlptr = strstr(buf, "\n")) != NULL) {
                nlptr[0] = '\0';
@@ -473,7 +473,7 @@ swap_free(void)
                return smprintf("%s", UNKNOWN_STR);
        }
 
-       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
+       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
                warn("swap_free: read error");
                fclose(fp);
                return smprintf("%s", UNKNOWN_STR);
@@ -510,7 +510,7 @@ swap_perc(void)
                return smprintf("%s", UNKNOWN_STR);
        }
 
-       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
+       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
                warn("swap_perc: read error");
                fclose(fp);
                return smprintf("%s", UNKNOWN_STR);
@@ -551,7 +551,7 @@ swap_total(void)
                warn("Failed to open file /proc/meminfo");
                return smprintf("%s", UNKNOWN_STR);
        }
-       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
+       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
                warn("swap_total: read error");
                fclose(fp);
                return smprintf("%s", UNKNOWN_STR);
@@ -582,7 +582,7 @@ swap_used(void)
                warn("Failed to open file /proc/meminfo");
                return smprintf("%s", UNKNOWN_STR);
        }
-       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
+       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
                warn("swap_used: read error");
                fclose(fp);
                return smprintf("%s", UNKNOWN_STR);
@@ -643,8 +643,7 @@ uptime(void)
 static char *
 username(void)
 {
-       uid_t uid = geteuid();
-       struct passwd *pw = getpwuid(uid);
+       struct passwd *pw = getpwuid(geteuid());
 
        if (pw == NULL) {
                warn("Failed to get username");