From 10dbc9543edd5b5a7929dd8fa87ed33dd545375c Mon Sep 17 00:00:00 2001 From: Aaron Marcher Date: Mon, 21 May 2018 14:44:21 +0200 Subject: Merge fmt_human_2 and fmt_human_10 to one function Now only one function, fmt_human, takes an additional argument "base". --- components/ram.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'components/ram.c') diff --git a/components/ram.c b/components/ram.c index cba22a1..0ac9753 100644 --- a/components/ram.c +++ b/components/ram.c @@ -17,7 +17,7 @@ return NULL; } - return fmt_human_2(free * 1024); + return fmt_human(free * 1024, 1024); } const char * @@ -48,7 +48,7 @@ return NULL; } - return fmt_human_2(total * 1024); + return fmt_human(total * 1024, 1024); } const char * @@ -65,7 +65,8 @@ return NULL; } - return fmt_human_2((total - free - buffers - cached) * 1024); + return fmt_human((total - free - buffers - cached) * 1024, + 1024); } #elif defined(__OpenBSD__) #include @@ -99,8 +100,8 @@ if (load_uvmexp(&uvmexp)) { free_pages = uvmexp.npages - uvmexp.active; - return fmt_human_2(pagetok(free_pages, - uvmexp.pageshift) * 1024); + return fmt_human(pagetok(free_pages, uvmexp.pageshift) * + 1024, 1024); } return NULL; @@ -126,8 +127,9 @@ struct uvmexp uvmexp; if (load_uvmexp(&uvmexp)) { - return fmt_human_2(pagetok(uvmexp.npages, - uvmexp.pageshift) * 1024); + return fmt_human(pagetok(uvmexp.npages, + uvmexp.pageshift) * 1024, + 1024); } return NULL; @@ -139,8 +141,9 @@ struct uvmexp uvmexp; if (load_uvmexp(&uvmexp)) { - return fmt_human_2(pagetok(uvmexp.active, - uvmexp.pageshift) * 1024); + return fmt_human(pagetok(uvmexp.active, + uvmexp.pageshift) * 1024, + 1024); } return NULL; -- cgit v1.2.3