Add the percent sign to *_perc functions Units should be added to the corresponding numbers
Aaron Marcher me@drkhsh.at
Sat, 19 May 2018 20:33:06 +0200
7 files changed,
12 insertions(+),
12 deletions(-)
M
components/battery.c
→
components/battery.c
@@ -23,7 +23,7 @@ if (pscanf(path, "%d", &perc) != 1) {
return NULL; } - return bprintf("%d", perc); + return bprintf("%d%%", perc); } const char *@@ -131,7 +131,7 @@ {
struct apm_power_info apm_info; if (load_apm_power_info(&apm_info)) { - return bprintf("%d", apm_info.battery_life); + return bprintf("%d%%", apm_info.battery_life); } return NULL;
M
components/cpu.c
→
components/cpu.c
@@ -34,7 +34,7 @@ valid = 1;
return NULL; } - return bprintf("%d", (int)(100 * + return bprintf("%d%%", (int)(100 * ((b[0] + b[1] + b[2] + b[5] + b[6]) - (a[0] + a[1] + a[2] + a[5] + a[6])) / ((b[0] + b[1] + b[2] + b[3] + b[4] + b[5] + b[6]) -@@ -88,7 +88,7 @@ valid = 1;
return NULL; } - return bprintf("%d", 100 * + return bprintf("%d%%", 100 * ((a[CP_USER] + a[CP_NICE] + a[CP_SYS] + a[CP_INTR]) - (b[CP_USER] + b[CP_NICE] + b[CP_SYS] + b[CP_INTR])) / ((a[CP_USER] + a[CP_NICE] + a[CP_SYS] + a[CP_INTR] +
M
components/disk.c
→
components/disk.c
@@ -29,7 +29,7 @@ warn("statvfs '%s':", mnt);
return NULL; } - return bprintf("%d", (int)(100 * + return bprintf("%d%%", (int)(100 * (1.0f - ((float)fs.f_bavail / (float)fs.f_blocks)))); }
M
components/ram.c
→
components/ram.c
@@ -28,7 +28,7 @@ "MemFree: %ld kB\n"
"MemAvailable: %ld kB\nBuffers: %ld kB\n" "Cached: %ld kB\n", &total, &free, &buffers, &buffers, &cached) == 5) ? - bprintf("%d", 100 * ((total - free) - (buffers + cached)) / + bprintf("%d%%", 100 * ((total - free) - (buffers + cached)) / total) : NULL; }@@ -97,7 +97,7 @@ int percent;
if (load_uvmexp(&uvmexp)) { percent = uvmexp.active * 100 / uvmexp.npages; - return bprintf("%d", percent); + return bprintf("%d%%", percent); } return NULL;
M
components/swap.c
→
components/swap.c
@@ -76,7 +76,7 @@ return NULL;
} sscanf(match, "SwapFree: %ld kB\n", &free); - return bprintf("%d", 100 * (total - free - cached) / total); + return bprintf("%d%%", 100 * (total - free - cached) / total); } const char *@@ -184,7 +184,7 @@ int total, used;
getstats(&total, &used); - return bprintf("%d", 100 * used / total); + return bprintf("%d%%", 100 * used / total); } const char *
M
components/volume.c
→
components/volume.c
@@ -42,5 +42,5 @@ }
close(afd); - return bprintf("%d", v & 0xff); + return bprintf("%d%%", v & 0xff); }
M
components/wifi.c
→
components/wifi.c
@@ -60,7 +60,7 @@ datastart = (datastart+(strlen(iface)+1));
sscanf(datastart + 1, " %*d %d %*d %*d\t\t %*d\t " "%*d\t\t%*d\t\t %*d\t %*d\t\t %*d", &cur); - return bprintf("%d", (int)((float)cur / total * 100)); + return bprintf("%d%%", (int)((float)cur / total * 100)); } const char *@@ -147,7 +147,7 @@ } else {
q = nr.nr_rssi >= -50 ? 100 : (nr.nr_rssi <= -100 ? 0 : (2 * (nr.nr_rssi + 100))); } - return bprintf("%d", q); + return bprintf("%d%%", q); } return NULL;