From 74c4f4ebdae8a12fc95840954dde574692234b01 Mon Sep 17 00:00:00 2001
From: Aaron Marcher <me@drkhsh.at>
Date: Sat, 19 May 2018 20:33:06 +0200
Subject: [PATCH] Add the percent sign to *_perc functions
Units should be added to the corresponding numbers
---
components/battery.c | 4 ++--
components/cpu.c | 4 ++--
components/disk.c | 2 +-
components/ram.c | 4 ++--
components/swap.c | 4 ++--
components/volume.c | 2 +-
components/wifi.c | 4 ++--
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/components/battery.c b/components/battery.c
index bcd42cd..5031608 100644
--- a/components/battery.c
+++ b/components/battery.c
@@ -23,7 +23,7 @@
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;
diff --git a/components/cpu.c b/components/cpu.c
index 60a7991..e333f97 100644
--- a/components/cpu.c
+++ b/components/cpu.c
@@ -34,7 +34,7 @@
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 @@
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] +
diff --git a/components/disk.c b/components/disk.c
index 00deea2..db18d12 100644
--- a/components/disk.c
+++ b/components/disk.c
@@ -29,7 +29,7 @@ disk_perc(const char *mnt)
return NULL;
}
- return bprintf("%d", (int)(100 *
+ return bprintf("%d%%", (int)(100 *
(1.0f - ((float)fs.f_bavail / (float)fs.f_blocks))));
}
diff --git a/components/ram.c b/components/ram.c
index 8f96b04..0eb2ea9 100644
--- a/components/ram.c
+++ b/components/ram.c
@@ -28,7 +28,7 @@
"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 @@
if (load_uvmexp(&uvmexp)) {
percent = uvmexp.active * 100 / uvmexp.npages;
- return bprintf("%d", percent);
+ return bprintf("%d%%", percent);
}
return NULL;
diff --git a/components/swap.c b/components/swap.c
index 73d24df..64feceb 100644
--- a/components/swap.c
+++ b/components/swap.c
@@ -76,7 +76,7 @@
}
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 @@
getstats(&total, &used);
- return bprintf("%d", 100 * used / total);
+ return bprintf("%d%%", 100 * used / total);
}
const char *
diff --git a/components/volume.c b/components/volume.c
index 8674211..0bfbe08 100644
--- a/components/volume.c
+++ b/components/volume.c
@@ -42,5 +42,5 @@ vol_perc(const char *card)
close(afd);
- return bprintf("%d", v & 0xff);
+ return bprintf("%d%%", v & 0xff);
}
diff --git a/components/wifi.c b/components/wifi.c
index b3e1723..389adab 100644
--- a/components/wifi.c
+++ b/components/wifi.c
@@ -60,7 +60,7 @@
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 @@
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;