Merge fmt_human_2 and fmt_human_10 to one function

Now only one function, fmt_human, takes an additional argument "base".

components/cpu.c

@@ -20,7 +20,7 @@
 			return NULL;
 		}
 
-		return fmt_human_10(freq * 1000);
+		return fmt_human(freq * 1000, 1000);
 	}
 
 	const char *
@@ -67,7 +67,7 @@
 			return NULL;
 		}
 
-		return fmt_human_10((size_t)freq * 1000 * 1000);
+		return fmt_human((size_t)freq * 1000 * 1000, 1000);
 	}
 
 	const char *

components/disk.c

@@ -16,7 +16,7 @@ disk_free(const char *mnt)
 		return NULL;
 	}
 
-	return fmt_human_2(fs.f_frsize * fs.f_bavail);
+	return fmt_human(fs.f_frsize * fs.f_bavail, 1024);
 }
 
 const char *
@@ -43,7 +43,7 @@ disk_total(const char *mnt)
 		return NULL;
 	}
 
-	return fmt_human_2(fs.f_frsize * fs.f_blocks);
+	return fmt_human(fs.f_frsize * fs.f_blocks, 1024);
 }
 
 const char *
@@ -56,5 +56,5 @@ disk_used(const char *mnt)
 		return NULL;
 	}
 
-	return fmt_human_2(fs.f_frsize * (fs.f_blocks - fs.f_bfree));
+	return fmt_human(fs.f_frsize * (fs.f_blocks - fs.f_bfree), 1024);
 }

components/netspeeds.c

@@ -29,7 +29,8 @@
 			return NULL;
 		}
 
-		return fmt_human_2((rxbytes - oldrxbytes) * 1000 / interval);
+		return fmt_human((rxbytes - oldrxbytes) * 1000 / interval,
+		                 1024);
 	}
 
 	const char *
@@ -54,7 +55,8 @@
 			return NULL;
 		}
 
-		return fmt_human_2((txbytes - oldtxbytes) * 1000 / interval);
+		return fmt_human((txbytes - oldtxbytes) * 1000 / interval,
+		                 1024);
 	}
 #elif defined(__OpenBSD__)
 	#include <string.h>
@@ -95,7 +97,8 @@
 			return NULL;
 		}
 
-		return fmt_human_2((rxbytes - oldrxbytes) * 1000 / interval);
+		return fmt_human((rxbytes - oldrxbytes) * 1000 / interval,
+		                 1024);
 	}
 
 	const char *
@@ -130,6 +133,7 @@
 			return NULL;
 		}
 
-		return fmt_human_2((txbytes - oldtxbytes) * 1000 / interval);
+		return fmt_human_2((txbytes - oldtxbytes) * 1000 / interval,
+		                   1024);
 	}
 #endif

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 <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;

components/swap.c

@@ -48,7 +48,7 @@
 		}
 		sscanf(match, "SwapFree: %ld kB\n", &free);
 
-		return fmt_human_2(free * 1024);
+		return fmt_human(free * 1024, 1024);
 	}
 
 	const char *
@@ -98,7 +98,7 @@
 		}
 		sscanf(match, "SwapTotal: %ld kB\n", &total);
 
-		return fmt_human_2(total * 1024);
+		return fmt_human(total * 1024, 1024);
 	}
 
 	const char *
@@ -126,7 +126,7 @@
 		}
 		sscanf(match, "SwapFree: %ld kB\n", &free);
 
-		return fmt_human_2((total - free - cached) * 1024);
+		return fmt_human((total - free - cached) * 1024, 1024);
 	}
 #elif defined(__OpenBSD__)
 	#include <stdlib.h>
@@ -178,7 +178,7 @@
 
 		getstats(&total, &used);
 
-		return fmt_human_2((total - used) * 1024);
+		return fmt_human((total - used) * 1024, 1024);
 	}
 
 	const char *
@@ -202,7 +202,7 @@
 
 		getstats(&total, &used);
 
-		return fmt_human_2(total * 1024);
+		return fmt_human(total * 1024, 1024);
 	}
 
 	const char *
@@ -212,6 +212,6 @@
 
 		getstats(&total, &used);
 
-		return fmt_human_2(used * 1024);
+		return fmt_human(used * 1024, 1024);
 	}
 #endif