lib/string_helpers: string_get_size() now returns characters wrote

[linux-block.git] / lib / string_helpers.c

diff --git a/lib/string_helpers.c b/lib/string_helpers.c
index 9982344cca34d6be6c0f3b7eeb4f1f08aa50fcdb..7713f73e66b0f35ba40966f78694f7d4d6326b42 100644 (file)
--- a/lib/string_helpers.c
+++ b/lib/string_helpers.c
@@ -31,9 +31,11 @@
  * giving the size in the required units.  @buf should have room for
  * at least 9 bytes and will always be zero terminated.
  *
+ * Return value: number of characters of output that would have been written
+ * (which may be greater than len, if output was truncated).
  */
-void string_get_size(u64 size, u64 blk_size, const enum string_size_units units,
-                    char *buf, int len)
+int string_get_size(u64 size, u64 blk_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"
@@ -126,8 +128,8 @@ void string_get_size(u64 size, u64 blk_size, const enum string_size_units units,
        else
                unit = units_str[units][i];
 
-       snprintf(buf, len, "%u%s %s", (u32)size,
-                tmp, unit);
+       return snprintf(buf, len, "%u%s %s", (u32)size,
+                       tmp, unit);
 }
 EXPORT_SYMBOL(string_get_size);