diff options
| author | Aaron Marcher <me@drkhsh.at> | 2018-05-20 00:42:07 +0200 |
|---|---|---|
| committer | Aaron Marcher <me@drkhsh.at> | 2018-05-20 00:42:07 +0200 |
| commit | c12b9cc50b5f476cd7b1de1dbd49e6282b1a042f (patch) | |
| tree | 05c9621a58a503fbe4dddb336928ea05077b8f4d /components/ram.c | |
| parent | 7873b3b1329d31e619a93cce99350a36803656d1 (diff) | |
Refactor ram.c
Diffstat (limited to 'components/ram.c')
| -rw-r--r-- | components/ram.c | 61 |
1 files changed, 37 insertions, 24 deletions
diff --git a/components/ram.c b/components/ram.c index 1c12aab..7c0870c 100644 --- a/components/ram.c +++ b/components/ram.c @@ -9,12 +9,15 @@ { 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 @@ { 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 @@ { 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 @@ { 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> |