diff options
| author | Rasmus Villemoes | 2015-02-13 00:01:50 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2015-02-13 03:54:13 +0100 |
| commit | d1214c65c02d503330ce86bd38e344a36599e055 (patch) | |
| tree | e07829fc569c35be5860b239ad3e9c4e2b28e6cb | |
| parent | lib/string_helpers.c:string_get_size(): use 32 bit arithmetic when possible (diff) | |
| download | kernel-qcow2-linux-d1214c65c02d503330ce86bd38e344a36599e055.tar.gz kernel-qcow2-linux-d1214c65c02d503330ce86bd38e344a36599e055.tar.xz kernel-qcow2-linux-d1214c65c02d503330ce86bd38e344a36599e055.zip | |
libstring_helpers.c:string_get_size(): return void
string_get_size() was documented to return an error, but in fact always
returned 0. Since the output always fits in 9 bytes, just document that
and let callers do what they do now: pass a small stack buffer and ignore
the return value.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | include/linux/string_helpers.h | 4 | ||||
| -rw-r--r-- | lib/string_helpers.c | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/include/linux/string_helpers.h b/include/linux/string_helpers.h index 6eb567ac56bc..657571817260 100644 --- a/include/linux/string_helpers.h +++ b/include/linux/string_helpers.h @@ -10,8 +10,8 @@ enum string_size_units { STRING_UNITS_2, /* use binary powers of 2^10 */ }; -int string_get_size(u64 size, enum string_size_units units, - char *buf, int len); +void string_get_size(u64 size, enum string_size_units units, + char *buf, int len); #define UNESCAPE_SPACE 0x01 #define UNESCAPE_OCTAL 0x02 diff --git a/lib/string_helpers.c b/lib/string_helpers.c index 2b3757f84b3b..8f8c4417f228 100644 --- a/lib/string_helpers.c +++ b/lib/string_helpers.c @@ -20,12 +20,12 @@ * @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" @@ -67,8 +67,6 @@ int string_get_size(u64 size, const enum string_size_units units, snprintf(buf, len, "%u%s %s", (u32)size, tmp, units_str[units][i]); - - return 0; } EXPORT_SYMBOL(string_get_size); |