Refactor ram.c
Aaron Marcher me@drkhsh.at
Sun, 20 May 2018 00:42:07 +0200
1 files changed,
37 insertions(+),
24 deletions(-)
jump to
M
components/ram.c
→
components/ram.c
@@ -9,12 +9,15 @@ ram_free(void)
{ long free; - return (pscanf("/proc/meminfo", - "MemTotal: %ld kB\n" - "MemFree: %ld kB\n" - "MemAvailable: %ld kB\n", - &free, &free, &free) == 3) ? - fmt_human_2(free * 1024, "B") : NULL; + if (pscanf("/proc/meminfo", + "MemTotal: %ld kB\n" + "MemFree: %ld kB\n" + "MemAvailable: %ld kB\n", + &free, &free, &free) != 3) { + return NULL; + } + + return fmt_human_2(free * 1024, "B"); } const char *@@ -22,15 +25,17 @@ ram_perc(void)
{ long total, free, buffers, cached; - return (pscanf("/proc/meminfo", - "MemTotal: %ld kB\n" - "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)) / - total) : - NULL; + if (pscanf("/proc/meminfo", + "MemTotal: %ld kB\n" + "MemFree: %ld kB\n" + "MemAvailable: %ld kB\nBuffers: %ld kB\n" + "Cached: %ld kB\n", + &total, &free, &buffers, &buffers, &cached) != 5) { + return NULL; + } + + return bprintf("%d%%", 100 * ((total - free) - + (buffers + cached)) / total); } const char *@@ -38,8 +43,12 @@ ram_total(void)
{ long total; - return (pscanf("/proc/meminfo", "MemTotal: %ld kB\n", &total) == 1) ? - fmt_human_2(total * 1024, "B") : NULL; + if (pscanf("/proc/meminfo", "MemTotal: %ld kB\n", + &total) != 1) { + return NULL; + } + + return fmt_human_2(total * 1024, "B"); } const char *@@ -47,13 +56,17 @@ ram_used(void)
{ long total, free, buffers, cached; - return (pscanf("/proc/meminfo", - "MemTotal: %ld kB\n" - "MemFree: %ld kB\n" - "MemAvailable: %ld kB\nBuffers: %ld kB\n" - "Cached: %ld kB\n", - &total, &free, &buffers, &buffers, &cached) == 5) ? - fmt_human_2((total - free - buffers - cached) * 1024, "B") : NULL; + if (pscanf("/proc/meminfo", + "MemTotal: %ld kB\n" + "MemFree: %ld kB\n" + "MemAvailable: %ld kB\nBuffers: %ld kB\n" + "Cached: %ld kB\n", + &total, &free, &buffers, &buffers, &cached) != 5) { + return NULL; + } + + return fmt_human_2((total - free - buffers - cached) * 1024, + "B"); } #elif defined(__OpenBSD__) #include <stdlib.h>