remove format characters from stat functions

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 8241451..cb4798b 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -35,7 +35,9 @@ struct arg {
 
 static char *smprintf(const char *fmt, ...);
 static char *battery_perc(const char *bat);
+static char *battery_power(const char *bat);
 static char *battery_state(const char *bat);
+static char *cpu_freq(void);
 static char *cpu_perc(void);
 static char *datetime(const char *fmt);
 static char *disk_free(const char *mnt);
@@ -115,7 +117,26 @@ battery_perc(const char *bat)
        fscanf(fp, "%i", &perc);
        fclose(fp);
 
-       return smprintf("%d%%", perc);
+       return smprintf("%d", perc);
+}
+
+static char *
+battery_power(const char *bat)
+{
+       char path[PATH_MAX];
+       FILE *fp;
+       int watts;
+
+       snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/power_now");
+       fp = fopen(path, "r");
+       if (fp == NULL) {
+               warn("Failed to open file %s", path);
+               return smprintf("%s", UNKNOWN_STR);
+       }
+       fscanf(fp, "%i", &watts);
+       fclose(fp);
+
+       return smprintf("%d", (watts + 500000) / 1000000);
 }
 
 static char *
@@ -147,6 +168,23 @@ battery_state(const char *bat)
        }
 }
 
+static char *
+cpu_freq(void)
+{
+       int freq;
+       FILE *fp;
+
+       fp = fopen("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq", "r");
+       if (fp == NULL) {
+               warn("Failed to open file /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq");
+               return smprintf("%s", UNKNOWN_STR);
+       }
+       fscanf(fp, "%i", &freq);
+       fclose(fp);
+
+       return smprintf("%d", (freq + 500) / 1000);
+}
+
 static char *
 cpu_perc(void)
 {
@@ -174,7 +212,7 @@ cpu_perc(void)
        fclose(fp);
 
        perc = 100 * ((b[0]+b[1]+b[2]) - (a[0]+a[1]+a[2])) / ((b[0]+b[1]+b[2]+b[3]) - (a[0]+a[1]+a[2]+a[3]));
-       return smprintf("%d%%", perc);
+       return smprintf("%d", perc);
 }
 
 static char *
@@ -217,7 +255,7 @@ disk_perc(const char *mnt)
 
        perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks));
 
-       return smprintf("%d%%", perc);
+       return smprintf("%d", perc);
 }
 
 static char *
@@ -395,7 +433,7 @@ ram_perc(void)
        fscanf(fp, "Cached: %ld kB\n", &cached);
        fclose(fp);
 
-       return smprintf("%d%%", 100 * ((total - free) - (buffers + cached)) / total);
+       return smprintf("%d", 100 * ((total - free) - (buffers + cached)) / total);
 }
 
 static char *
@@ -534,7 +572,7 @@ swap_perc(void)
        }
        sscanf(match, "SwapFree: %ld kB\n", &free);
 
-       return smprintf("%d%%", 100 * (total - free - cached) / total);
+       return smprintf("%d", 100 * (total - free - cached) / total);
 }
 
 static char *
@@ -623,7 +661,7 @@ temp(const char *file)
        fscanf(fp, "%d", &temp);
        fclose(fp);
 
-       return smprintf("%d°C", temp / 1000);
+       return smprintf("%d", temp / 1000);
 }
 
 static char *
@@ -690,7 +728,7 @@ vol_perc(const char *card)
 
        close(afd);
 
-       return smprintf("%d%%", v & 0xff);
+       return smprintf("%d", v & 0xff);
 }
 
 static char *
@@ -732,7 +770,7 @@ wifi_perc(const char *iface)
        datastart = (datastart+(strlen(iface)+1));
        sscanf(datastart + 1, " %*d   %d  %*d  %*d                %*d      %*d          %*d              %*d      %*d            %*d", &perc);
 
-       return smprintf("%d%%", perc);
+       return smprintf("%d", perc);
 }
 
 static char *