From ec5c35ec9f23254f09e734d0c1880559774dfa52 Mon Sep 17 00:00:00 2001
From: Aaron Marcher <me@drkhsh.at>
Date: Mon, 21 May 2018 00:16:54 +0200
Subject: Remove units from numbers

This is a first step to decouple formatting from information because of
two reasons:

 1. The components should only gather and return the values by design
 2. Fine grained user control should be a focus

Scaling will be implemented in a different way in a later commit.
---
 components/ram.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'components/ram.c')

diff --git a/components/ram.c b/components/ram.c
index 7c0870c..f653156 100644
--- a/components/ram.c
+++ b/components/ram.c
@@ -17,7 +17,7 @@
 			return NULL;
 		}
 
-		return fmt_human_2(free * 1024, "B");
+		return fmt_human_2(free * 1024);
 	}
 
 	const char *
@@ -34,8 +34,8 @@
 			return NULL;
 		}
 
-		return bprintf("%d%%", 100 * ((total - free) -
-		                              (buffers + cached)) / total);
+		return bprintf("%d", 100 * ((total - free) -
+		                            (buffers + cached)) / total);
 	}
 
 	const char *
@@ -48,7 +48,7 @@
 			return NULL;
 		}
 
-		return fmt_human_2(total * 1024, "B");
+		return fmt_human_2(total * 1024);
 	}
 
 	const char *
@@ -65,8 +65,7 @@
 			return NULL;
 		}
 
-		return fmt_human_2((total - free - buffers - cached) * 1024,
-		                   "B");
+		return fmt_human_2((total - free - buffers - cached) * 1024);
 	}
 #elif defined(__OpenBSD__)
 	#include <stdlib.h>
@@ -96,7 +95,8 @@
 
 		if (load_uvmexp(&uvmexp)) {
 			free_pages = uvmexp.npages - uvmexp.active;
-			return fmt_human_2(pagetok(free_pages, uvmexp.pageshift) * 1024, "B");
+			return fmt_human_2(pagetok(free_pages,
+			                           uvmexp.pageshift) * 1024);
 		}
 
 		return NULL;
@@ -110,7 +110,7 @@
 
 		if (load_uvmexp(&uvmexp)) {
 			percent = uvmexp.active * 100 / uvmexp.npages;
-			return bprintf("%d%%", percent);
+			return bprintf("%d", percent);
 		}
 
 		return NULL;
@@ -122,7 +122,8 @@
 		struct uvmexp uvmexp;
 
 		if (load_uvmexp(&uvmexp)) {
-			return fmt_human_2(pagetok(uvmexp.npages, uvmexp.pageshift) * 1024, "B");
+			return fmt_human_2(pagetok(uvmexp.npages,
+			                           uvmexp.pageshift) * 1024);
 		}
 
 		return NULL;
@@ -134,7 +135,8 @@
 		struct uvmexp uvmexp;
 
 		if (load_uvmexp(&uvmexp)) {
-			return fmt_human_2(pagetok(uvmexp.active, uvmexp.pageshift) * 1024, "B");
+			return fmt_human_2(pagetok(uvmexp.active,
+			                           uvmexp.pageshift) * 1024);
 		}
 
 		return NULL;
-- 
cgit v1.2.3