amolinae06/slstatus
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge fmt_human_2 and fmt_human_10 to one function

Browse source 
Now only one function, fmt_human, takes an additional argument "base".
This commit is contained in:
Aaron Marcher 2018-05-21 14:44:21 +02:00
parent fc0dde5a60
commit 10dbc9543e
7 changed files with 44 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

21
components/ram.c
View file

@ -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 <stdlib.h>
@ -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;