remove format characters from stat functions
Aaron Marcher info@nulltime.net
Mon, 12 Jun 2017 23:59:21 +0200
2 files changed,
12 insertions(+),
12 deletions(-)
M
config.def.h
→
config.def.h
@@ -41,8 +41,8 @@ - vol_perc (oss/alsa volume status (see README)) [argument: /dev/mixer]
- wifi_perc (wifi signal in percent) [argument: wifi card interface name] - wifi_essid (wifi essid) [argument: wifi card interface name] */ static const struct arg args[] = { - /* function format argument */ - { cpu_perc, "[CPU %4s] ", NULL }, - { ram_perc, "[RAM %3s] ", NULL }, - { datetime, "[ %s ]", "%F %T" }, + /* function format argument */ + { cpu_perc, "[CPU %3s%%] ", NULL }, + { ram_perc, "[RAM %2s%%] ", NULL }, + { datetime, "[ %s ]", "%F %T" }, };
M
slstatus.c
→
slstatus.c
@@ -117,7 +117,7 @@ }
fscanf(fp, "%i", &perc); fclose(fp); - return smprintf("%d%%", perc); + return smprintf("%d", perc); } static char *@@ -212,7 +212,7 @@ fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[3]);
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 *@@ -255,7 +255,7 @@ }
perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks)); - return smprintf("%d%%", perc); + return smprintf("%d", perc); } static char *@@ -433,7 +433,7 @@ fscanf(fp, "MemAvailable: %ld kB\nBuffers: %ld kB\n", &buffers, &buffers);
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 *@@ -572,7 +572,7 @@ return smprintf("%s", UNKNOWN_STR);
} 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 *@@ -661,7 +661,7 @@ }
fscanf(fp, "%d", &temp); fclose(fp); - return smprintf("%d°C", temp / 1000); + return smprintf("%d", temp / 1000); } static char *@@ -728,7 +728,7 @@ }
close(afd); - return smprintf("%d%%", v & 0xff); + return smprintf("%d", v & 0xff); } static char *@@ -770,7 +770,7 @@ }
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 *