[U-Boot] [PATCH] [v2] allow print_size to print large numbers on 32-bit systems

[U-Boot] [PATCH] [v2] allow print_size to print large numbers on 32-bit systems

[Timur Tabi]

Modify print_size() so that it can accept numbers larger than 4GB on 32-bit
systems.

Add support for display terabyte, petabyte, and exabyte sizes.  Change the
output to use International Electrotechnical Commission binary prefix standard.

Signed-off-by: Timur Tabi <timur@freescale.com>
---
 lib_generic/display_options.c |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib_generic/display_options.c b/lib_generic/display_options.c
index da17a62..53b154d 100644
--- a/lib_generic/display_options.c
+++ b/lib_generic/display_options.c
@@ -40,22 +40,22 @@ int display_options (void)
 
 /*
  * print sizes as "xxx kB", "xxx.y kB", "xxx MB", "xxx.y MB",
- * xxx GB, or xxx.y GB as needed; allow for optional trailing string
+ * xxx GB, xxx.y GB, etc as needed; allow for optional trailing string
  * (like "\n")
  */
 void print_size(unsigned long long size, const char *s)
 {
 	unsigned long m = 0, n;
-	unsigned long long d = 1 << 30; 	/* 1 GB */
-	char  c = 'G';
-
-	if (size < d) {			/* try MB */
-		c = 'M';
-		d = 1 << 20;
-		if (size < d) {		/* print in kB */
-			c = 'k';
-			d = 1 << 10;
-		}
+	static const char names[] = {'K', 'M', 'G', 'T', 'P', 'E'};
+	unsigned long long d;
+	char c;
+	unsigned int i;
+
+	for (i = ARRAY_SIZE(names); i > 0 ; i--) {
+		d = 1ULL << (10 * i);
+		c = names[i - 1];
+		if (size >= d)
+			break;
 	}
 
 	n = size / d;
@@ -74,7 +74,7 @@ void print_size(unsigned long long size, const char *s)
 	if (m) {
 		printf (".%ld", m);
 	}
-	printf (" %cB%s", c, s);
+	printf (" %ciB%s", c, s);
 }
 
 /*
-- 
1.6.5

[U-Boot] [PATCH] [v2] allow print_size to print large numbers on 32-bit systems

[Scott Wood]

Timur Tabi wrote:
> Modify print_size() so that it can accept numbers larger than 4GB on 32-bit
> systems.
> 
> Add support for display terabyte, petabyte, and exabyte sizes.  Change the
> output to use International Electrotechnical Commission binary prefix standard.
> 
> Signed-off-by: Timur Tabi <timur@freescale.com>
> ---
>  lib_generic/display_options.c |   22 +++++++++++-----------
>  1 files changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/lib_generic/display_options.c b/lib_generic/display_options.c
> index da17a62..53b154d 100644
> --- a/lib_generic/display_options.c
> +++ b/lib_generic/display_options.c
> @@ -40,22 +40,22 @@ int display_options (void)
>  
>  /*
>   * print sizes as "xxx kB", "xxx.y kB", "xxx MB", "xxx.y MB",
> - * xxx GB, or xxx.y GB as needed; allow for optional trailing string
> + * xxx GB, xxx.y GB, etc as needed; allow for optional trailing string
[snip]
> -	printf (" %cB%s", c, s);
> +	printf (" %ciB%s", c, s);

Comment should be updated to match the code.

-Scott