From 849c183f23a68d6204d5aacd0b9750374a5f59b9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 26 Mar 2011 15:10:12 -0400 Subject: [PATCH] tweak --- DataUnits.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DataUnits.hs b/DataUnits.hs index a175b5f6aa..c81c6e42e5 100644 --- a/DataUnits.hs +++ b/DataUnits.hs @@ -11,6 +11,7 @@ module DataUnits ( memoryUnits, bandwidthUnits, oldSchoolUnits, + roughSize, compareSizes, readSize @@ -142,11 +143,10 @@ readSize units input where (number, rest) = head parsednum multiplier = head $ parsedunit + unitname = takeWhile isAlpha $ dropWhile isSpace rest parsednum = reads input :: [(Double, String)] - parsedunit = lookupUnit units unit - - unit = takeWhile isAlpha $ dropWhile isSpace rest + parsedunit = lookupUnit units unitname lookupUnit _ [] = [1] -- no unit given, assume bytes lookupUnit [] _ = []