From: Sascha Wildner <saw@online.de>
Date: Tue, 9 Jul 2013 20:48:26 +0000 (+0200)
Subject: installer: Divide and multiply instead of shifting.
X-Git-Url: https://gitweb.dragonflybsd.org/~mneumann/dragonfly.git/commitdiff_plain/4abb0328b7940582ac480e3c6ff518e1e65804d2

installer: Divide and multiply instead of shifting.
---

diff --git a/usr.sbin/installer/libinstaller/functions.c b/usr.sbin/installer/libinstaller/functions.c
index bcf602bf72..2b1a4a4061 100644
--- a/usr.sbin/installer/libinstaller/functions.c
+++ b/usr.sbin/installer/libinstaller/functions.c
@@ -246,7 +246,8 @@ capacity_to_string(long capacity)
 	if (capacity < 0)
 		strlcpy(string, "*", 2);
 	else
-		humanize_number(string, sizeof(string), capacity << 20, "",
+		humanize_number(string, sizeof(string),
+		    capacity * 1024 * 1024, "",
 		    HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL);
 
 	return(string);
@@ -265,7 +266,7 @@ string_to_capacity(const char *string, long *capacity)
 	error = dehumanize_number(string, &result);
 	if (error != 0)
 		return(0);
-	result >>= 20;
+	result /= 1024 * 1024;
 	if (result == 0)
 		return(0);
 	*capacity = result;