Merge pull request #17 from R41z/master

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 69fb6a5..fefdf6f 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -116,15 +116,9 @@ battery_perc(const char *battery)
 static char *
 battery_state(const char *battery)
 {
-       char *state[12]; 
+       char state[12]; 
        FILE *fp;
 
-       if (!state) {
-               warn("Failed to get battery state.");
-               return smprintf(UNKNOWN_STR);
-       }
-
-
        ccat(3, "/sys/class/power_supply/", battery, "/status");
        fp = fopen(concat, "r");
        if (fp == NULL) {
@@ -278,9 +272,7 @@ hostname(void)
        }
 
        fgets(hostname, sizeof(hostname), fp);
-       /* FIXME: needs improvement */
-       memset(&hostname[strlen(hostname)], '\0',
-               sizeof(hostname) - strlen(hostname));
+       hostname[strlen(hostname)-1] = '\0';
        fclose(fp);
 
        return smprintf("%s", hostname);
@@ -607,7 +599,7 @@ main(void)
 {
        unsigned short int i;
        char status_string[4096];
-       char *res, *element, *status_old;
+       char *res, *element;
        struct arg argument;
        struct sigaction act;