diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-04-25 15:26:28 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2022-08-08 11:04:45 -0400 |
| commit | 0b1d01c360dca1442fbaf50f60654c9da034d349 (patch) | |
| tree | 428f91adc8e13146aa0c73dd289e328c36cc71f9 | |
| parent | f2f1d3b27749acedb2a4f4ea8a663f4f321b6a6b (diff) | |
lib/string_helpers: string_get_size() now returns characters wrote
printbuf now needs to know the number of characters that would have been
written if the buffer was too small, like snprintf(); this changes
string_get_size() to return the return value of snprintf().
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Cc: Andy Shevchenko <andy@kernel.org>
Acked-by: Andy Shevchenko <andy@kernel.org>
| -rw-r--r-- | include/linux/string_helpers.h | 4 | ||||
| -rw-r--r-- | lib/string_helpers.c | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/include/linux/string_helpers.h b/include/linux/string_helpers.h index c048eaec0894..ae4383f0fe7b 100644 --- a/include/linux/string_helpers.h +++ b/include/linux/string_helpers.h @@ -19,8 +19,8 @@ enum string_size_units { STRING_UNITS_2, /* use binary powers of 2^10 */ }; -void string_get_size(u64 size, u64 blk_size, enum string_size_units units, - char *buf, int len); +int string_get_size(u64 size, u64 blk_size, enum string_size_units units, + char *buf, int len); #define UNESCAPE_SPACE BIT(0) #define UNESCAPE_OCTAL BIT(1) diff --git a/lib/string_helpers.c b/lib/string_helpers.c index b366c660e684..a48c6a1cdd1d 100644 --- a/lib/string_helpers.c +++ b/lib/string_helpers.c @@ -33,8 +33,8 @@ * at least 9 bytes and will always be zero terminated. * */ -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" @@ -127,8 +127,7 @@ 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); |