pk
/
slstatus
mirror of https://github.com/pikami/slstatus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add the percent sign to *_perc functions 

Units should be added to the corresponding numbers
This commit is contained in:
Aaron Marcher 2018-05-19 20:33:06 +02:00
parent 68a3902dc5
commit 74c4f4ebda
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/battery.c
View File

@ -23,7 +23,7 @@
return NULL; return NULL;
} }
return bprintf("%d", perc); return bprintf("%d%%", perc);
} }
const char * const char *
@ -131,7 +131,7 @@
struct apm_power_info apm_info; struct apm_power_info apm_info;
if (load_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; return NULL;

4
components/cpu.c
View File

@ -34,7 +34,7 @@
return NULL; return NULL;
} }
return bprintf("%d", (int)(100 * return bprintf("%d%%", (int)(100 *
((b[0] + b[1] + b[2] + b[5] + b[6]) - ((b[0] + b[1] + b[2] + b[5] + b[6]) -
(a[0] + a[1] + a[2] + a[5] + a[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]) - ((b[0] + b[1] + b[2] + b[3] + b[4] + b[5] + b[6]) -
@ -88,7 +88,7 @@
return NULL; return NULL;
} }
return bprintf("%d", 100 * return bprintf("%d%%", 100 *
((a[CP_USER] + a[CP_NICE] + a[CP_SYS] + a[CP_INTR]) - ((a[CP_USER] + a[CP_NICE] + a[CP_SYS] + a[CP_INTR]) -
(b[CP_USER] + b[CP_NICE] + b[CP_SYS] + b[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] + ((a[CP_USER] + a[CP_NICE] + a[CP_SYS] + a[CP_INTR] +

2
components/disk.c
View File

@ -29,7 +29,7 @@ disk_perc(const char *mnt)
return NULL; return NULL;
} }
return bprintf("%d", (int)(100 * return bprintf("%d%%", (int)(100 *
(1.0f - ((float)fs.f_bavail / (float)fs.f_blocks)))); (1.0f - ((float)fs.f_bavail / (float)fs.f_blocks))));
} }

4
components/ram.c
View File

@ -28,7 +28,7 @@
"MemAvailable: %ld kB\nBuffers: %ld kB\n" "MemAvailable: %ld kB\nBuffers: %ld kB\n"
"Cached: %ld kB\n", "Cached: %ld kB\n",
&total, &free, &buffers, &buffers, &cached) == 5) ? &total, &free, &buffers, &buffers, &cached) == 5) ?
bprintf("%d", 100 * ((total - free) - (buffers + cached)) / bprintf("%d%%", 100 * ((total - free) - (buffers + cached)) /
total) : total) :
NULL; NULL;
} }
@ -97,7 +97,7 @@
if (load_uvmexp(&uvmexp)) { if (load_uvmexp(&uvmexp)) {
percent = uvmexp.active * 100 / uvmexp.npages; percent = uvmexp.active * 100 / uvmexp.npages;
return bprintf("%d", percent); return bprintf("%d%%", percent);
} }
return NULL; return NULL;

4
components/swap.c
View File

@ -76,7 +76,7 @@
} }
sscanf(match, "SwapFree: %ld kB\n", &free); 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 * const char *
@ -184,7 +184,7 @@
getstats(&total, &used); getstats(&total, &used);
return bprintf("%d", 100 * used / total); return bprintf("%d%%", 100 * used / total);
} }
const char * const char *

2
components/volume.c
View File

@ -42,5 +42,5 @@ vol_perc(const char *card)
close(afd); close(afd);
return bprintf("%d", v & 0xff); return bprintf("%d%%", v & 0xff);
} }

4
components/wifi.c
View File

@ -60,7 +60,7 @@
sscanf(datastart + 1, " %*d %d %*d %*d\t\t %*d\t " sscanf(datastart + 1, " %*d %d %*d %*d\t\t %*d\t "
"%*d\t\t%*d\t\t %*d\t %*d\t\t %*d", &cur); "%*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 * const char *
@ -147,7 +147,7 @@
q = nr.nr_rssi >= -50 ? 100 : (nr.nr_rssi <= -100 ? 0 : q = nr.nr_rssi >= -50 ? 100 : (nr.nr_rssi <= -100 ? 0 :
(2 * (nr.nr_rssi + 100))); (2 * (nr.nr_rssi + 100)));
} }
return bprintf("%d", q); return bprintf("%d%%", q);
} }
return NULL; return NULL;