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/swap.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'components/swap.c')

diff --git a/components/swap.c b/components/swap.c
index f5db667..c697d61 100644
--- a/components/swap.c
+++ b/components/swap.c
@@ -48,7 +48,7 @@
 		}
 		sscanf(match, "SwapFree: %ld kB\n", &free);
 
-		return fmt_human_2(free * 1024, "B");
+		return fmt_human_2(free * 1024);
 	}
 
 	const char *
@@ -80,7 +80,7 @@
 			return NULL;
 		}
 
-		return bprintf("%d%%", 100 * (total - free - cached) / total);
+		return bprintf("%d", 100 * (total - free - cached) / total);
 	}
 
 	const char *
@@ -98,7 +98,7 @@
 		}
 		sscanf(match, "SwapTotal: %ld kB\n", &total);
 
-		return fmt_human_2(total * 1024, "B");
+		return fmt_human_2(total * 1024);
 	}
 
 	const char *
@@ -126,7 +126,7 @@
 		}
 		sscanf(match, "SwapFree: %ld kB\n", &free);
 
-		return fmt_human_2((total - free - cached) * 1024, "B");
+		return fmt_human_2((total - free - cached) * 1024);
 	}
 #elif defined(__OpenBSD__)
 	#include <stdlib.h>
@@ -178,7 +178,7 @@
 
 		getstats(&total, &used);
 
-		return fmt_human_2((total - used) * 1024, "B");
+		return fmt_human_2((total - used) * 1024);
 	}
 
 	const char *
@@ -192,7 +192,7 @@
 			return NULL;
 		}
 
-		return bprintf("%d%%", 100 * used / total);
+		return bprintf("%d", 100 * used / total);
 	}
 
 	const char *
@@ -202,7 +202,7 @@
 
 		getstats(&total, &used);
 
-		return fmt_human_2(total * 1024, "B");
+		return fmt_human_2(total * 1024);
 	}
 
 	const char *
@@ -212,6 +212,6 @@
 
 		getstats(&total, &used);
 
-		return fmt_human_2(used * 1024, "B");
+		return fmt_human_2(used * 1024);
 	}
 #endif
-- 
cgit v1.2.3