diff options
| author | drkhsh <me@drkhsh.at> | 2022-10-28 00:11:15 +0200 |
|---|---|---|
| committer | Rafael Marçalo <raroma09@gmail.com> | 2022-10-28 22:22:15 +0100 |
| commit | 5b210b49cbdcd2f9e34292a76a1b41fb0f70e0e1 (patch) | |
| tree | 7f2201d611ca2eff298bc7f661dc203ac2042a6b | |
| parent | 6f76e63887db5a19b9f3d3e2f4e212bfa0a4ee84 (diff) | |
ram: Refactor Linux perc/used
Fixes up overly complicated line, by splitting up logic
| -rw-r--r-- | components/ram.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/components/ram.c b/components/ram.c index 305d4bb..1a187a0 100644 --- a/components/ram.c +++ b/components/ram.c @@ -27,6 +27,7 @@ ram_perc(const char *unused) { uintmax_t total, free, buffers, cached; + int percent; if (pscanf("/proc/meminfo", "MemTotal: %ju kB\n" @@ -42,8 +43,8 @@ return NULL; } - return bprintf("%d", 100 * ((total - free) - (buffers + cached)) - / total); + percent = 100 * ((total - free) - (buffers + cached)) / total; + return bprintf("%d", percent); } const char * @@ -62,7 +63,7 @@ const char * ram_used(const char *unused) { - uintmax_t total, free, buffers, cached; + uintmax_t total, free, buffers, cached, used; if (pscanf("/proc/meminfo", "MemTotal: %ju kB\n" @@ -70,12 +71,11 @@ "MemAvailable: %ju kB\n" "Buffers: %ju kB\n" "Cached: %ju kB\n", - &total, &free, &buffers, &buffers, &cached) != 5) { + &total, &free, &buffers, &buffers, &cached) != 5) return NULL; - } - return fmt_human((total - free - buffers - cached) * 1024, - 1024); + used = (total - free - buffers - cached); + return fmt_human(used * 1024, 1024); } #elif defined(__OpenBSD__) #include <stdlib.h> |