libbb: move nuke_str() from passwd into libbb

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

diff --git a/libbb/human_readable.c b/libbb/human_readable.c
index 3050d7d1eb2b7237b0c6d50d24d3f318764423ae..0b2eb777e2375c7f939ddcbba5eab7f589fc76a1 100644 (file)
--- a/libbb/human_readable.c
+++ b/libbb/human_readable.c
@@ -25,7 +25,7 @@
  *      Some code to omit the decimal point and tenths digit is sketched out
  *      and "#if 0"'d below.
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
@@ -53,12 +53,12 @@ const char* FAST_FUNC make_human_readable_str(unsigned long long val,
        u = unit_chars;
 
        if (display_unit) {
-               val += display_unit/2;  /* Deal with rounding */
-               val /= display_unit;    /* Don't combine with the line above! */
+               val += display_unit/2;  /* Deal with rounding */
+               val /= display_unit;    /* Don't combine with the line above! */
                /* will just print it as ulonglong (below) */
        } else {
                while ((val >= 1024)
-                /* && (u < unit_chars + sizeof(unit_chars) - 1) - never happens */
+                /* && (u < unit_chars + sizeof(unit_chars) - 1) - always true */
                ) {
                        fmt = "%llu.%u%c";
                        u++;
@@ -94,7 +94,7 @@ const char* FAST_FUNC make_human_readable_str(unsigned long long val,
 
 /* Convert unsigned long long value into compact 5-char representation.
  * String is not terminated (buf[5] is untouched) */
-void FAST_FUNC smart_ulltoa5(unsigned long long ul, char buf[6], const char *scale)
+char* FAST_FUNC smart_ulltoa5(unsigned long long ul, char buf[5], const char *scale)
 {
        const char *fmt;
        char c;
@@ -145,12 +145,13 @@ void FAST_FUNC smart_ulltoa5(unsigned long long ul, char buf[6], const char *sca
                buf[3] = "0123456789"[v];
                buf[4] = scale[idx]; /* typically scale = " kmgt..." */
        }
+       return buf + 5;
 }
 
 /* Convert unsigned long long value into compact 4-char
  * representation. Examples: "1234", "1.2k", " 27M", "123T"
  * String is not terminated (buf[4] is untouched) */
-void FAST_FUNC smart_ulltoa4(unsigned long long ul, char buf[5], const char *scale)
+char* FAST_FUNC smart_ulltoa4(unsigned long long ul, char buf[4], const char *scale)
 {
        const char *fmt;
        char c;
@@ -194,4 +195,5 @@ void FAST_FUNC smart_ulltoa4(unsigned long long ul, char buf[5], const char *sca
                buf[2] = "0123456789"[v];
                buf[3] = scale[idx]; /* typically scale = " kmgt..." */
        }
+       return buf + 4;
 }