PID should be stored in pid_t, not int or long.

[oweals/busybox.git] / libbb / human_readable.c

diff --git a/libbb/human_readable.c b/libbb/human_readable.c
index 656889150d7ac79a2df47c305eac2a557b770510..ff1b5514118fcb49eef1cde03c288313820cc85c 100644 (file)
--- a/libbb/human_readable.c
+++ b/libbb/human_readable.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * June 30, 2001                 Manuel Novoa III
  *
@@ -13,8 +14,8 @@
  *      representations (say, powers of 1024) and manipulating coefficients.
  *      The base ten "bytes" output could be handled similarly.
  *
- *   2) This routine always outputs a decimal point and a tenths digit when 
- *      display_unit != 0.  Hence, it isn't uncommon for the returned string 
+ *   2) This routine always outputs a decimal point and a tenths digit when
+ *      display_unit != 0.  Hence, it isn't uncommon for the returned string
  *      to have a length of 5 or 6.
  *
  *      It might be nice to add a flag to indicate no decimal digits in
@@ -28,16 +29,16 @@
 #include <stdio.h>
 #include "libbb.h"
 
-const char *make_human_readable_str(unsigned long long size, 
+const char *make_human_readable_str(unsigned long long size,
        unsigned long block_size, unsigned long display_unit)
 {
        /* The code will adjust for additional (appended) units. */
        static const char zero_and_units[] = { '0', 0, 'k', 'M', 'G', 'T' };
-       static const char fmt[] = "%Lu";
-       static const char fmt_tenths[] = "%Lu.%d%c";
+       static const char fmt[] = "%llu";
+       static const char fmt_tenths[] = "%llu.%d%c";
 
        static char str[21];            /* Sufficient for 64 bit unsigned integers. */
-       
+
        unsigned long long val;
        int frac;
        const char *u;
@@ -57,12 +58,13 @@ const char *make_human_readable_str(unsigned long long size,
                val /= display_unit;    /* Don't combine with the line above!!! */
        } else {
                ++u;
-               while ((val >= KILOBYTE)
-                          && (u < zero_and_units + sizeof(zero_and_units) - 1)) {
+               while ((val >= 1024)
+                && (u < zero_and_units + sizeof(zero_and_units) - 1)
+               ) {
                        f = fmt_tenths;
                        ++u;
-                       frac = ((((int)(val % KILOBYTE)) * 10) + (KILOBYTE/2)) / KILOBYTE;
-                       val /= KILOBYTE;
+                       frac = (((int)(val % 1024)) * 10 + 1024/2) / 1024;
+                       val /= 1024;
                }
                if (frac >= 10) {               /* We need to round up here. */
                        ++val;
@@ -74,7 +76,7 @@ const char *make_human_readable_str(unsigned long long size,
                        if ( frac >= 5 ) {
                                ++val;
                        }
-                       f = "%Lu%*c" /* fmt_no_tenths */ ;
+                       f = "%llu%*c" /* fmt_no_tenths */ ;
                        frac = 1;
                }
 #endif