From 2efc602fb20771823cc472807d9cfb9ff61244db Mon Sep 17 00:00:00 2001 From: Jef Poskanzer Date: Mon, 28 Jan 2013 16:52:04 -0800 Subject: [PATCH] The units handling was interpreting capital K/M/G as 1024/1048576/1073741824 and lowercase k/m/g as 1000/1000000/1000000000. This was deemed to be too confusing. Now both capital and lowercase give the powers-of-two version. --- src/units.c | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/src/units.c b/src/units.c index 6359de6..917422b 100644 --- a/src/units.c +++ b/src/units.c @@ -71,10 +71,6 @@ extern "C" const long MEGA_UNIT = 1024 * 1024; const long GIGA_UNIT = 1024 * 1024 * 1024; - const long KILO_UNIT_SI = 1000; - const long MEGA_UNIT_SI = 1000 * 1000; - const long GIGA_UNIT_SI = 1000 * 1000 * 1000; - /* ------------------------------------------------------------------- * unit_atof * @@ -96,24 +92,15 @@ extern "C" /* convert according to [Gg Mm Kk] */ switch (suffix) { - case 'G': + case 'g': case 'G': n *= GIGA_UNIT; break; - case 'M': + case 'm': case 'M': n *= MEGA_UNIT; break; - case 'K': + case 'k': case 'K': n *= KILO_UNIT; break; - case 'g': - n *= GIGA_UNIT_SI; - break; - case 'm': - n *= MEGA_UNIT_SI; - break; - case 'k': - n *= KILO_UNIT_SI; - break; default: break; } @@ -141,24 +128,15 @@ extern "C" /* convert according to [Gg Mm Kk] */ switch (suffix) { - case 'G': + case 'g': case 'G': n *= GIGA_UNIT; break; - case 'M': + case 'm': case 'M': n *= MEGA_UNIT; break; - case 'K': + case 'k': case 'K': n *= KILO_UNIT; break; - case 'g': - n *= GIGA_UNIT_SI; - break; - case 'm': - n *= MEGA_UNIT_SI; - break; - case 'k': - n *= KILO_UNIT_SI; - break; default: break; }