ibmveth: Add function to enable live MAC address changes

[cascardo/linux.git] / lib / string_helpers.c

diff --git a/lib/string_helpers.c b/lib/string_helpers.c
index 58b78ba..8f8c441 100644 (file)
--- a/lib/string_helpers.c
+++ b/lib/string_helpers.c
@@ -20,19 +20,18 @@
  * @len:       length of buffer
  *
  * This function returns a string formatted to 3 significant figures
- * giving the size in the required units.  Returns 0 on success or
- * error on failure.  @buf is always zero terminated.
+ * giving the size in the required units.  @buf should have room for
+ * at least 9 bytes and will always be zero terminated.
  *
  */
-int string_get_size(u64 size, const enum string_size_units units,
-                   char *buf, int len)
+void string_get_size(u64 size, const enum string_size_units units,
+                    char *buf, int len)
 {
        static const char *const units_10[] = {
-               "B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB", NULL
+               "B", "kB", "MB", "GB", "TB", "PB", "EB"
        };
        static const char *const units_2[] = {
-               "B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB",
-               NULL
+               "B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB"
        };
        static const char *const *const units_str[] = {
                [STRING_UNITS_10] = units_10,
@@ -43,13 +42,13 @@ int string_get_size(u64 size, const enum string_size_units units,
                [STRING_UNITS_2] = 1024,
        };
        int i, j;
-       u64 remainder = 0, sf_cap;
+       u32 remainder = 0, sf_cap;
        char tmp[8];
 
        tmp[0] = '\0';
        i = 0;
        if (size >= divisor[units]) {
-               while (size >= divisor[units] && units_str[units][i]) {
+               while (size >= divisor[units]) {
                        remainder = do_div(size, divisor[units]);
                        i++;
                }
@@ -60,17 +59,14 @@ int string_get_size(u64 size, const enum string_size_units units,
 
                if (j) {
                        remainder *= 1000;
-                       do_div(remainder, divisor[units]);
-                       snprintf(tmp, sizeof(tmp), ".%03lld",
-                                (unsigned long long)remainder);
+                       remainder /= divisor[units];
+                       snprintf(tmp, sizeof(tmp), ".%03u", remainder);
                        tmp[j+1] = '\0';
                }
        }
 
-       snprintf(buf, len, "%lld%s %s", (unsigned long long)size,
+       snprintf(buf, len, "%u%s %s", (u32)size,
                 tmp, units_str[units][i]);
-
-       return 0;
 }
 EXPORT_SYMBOL(string_get_size);