openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Rasmus Villemoes 2015-02-12 15:01:50 -08:00 committed by Linus Torvalds
parent 84b9fbedf5
commit d1214c65c0
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/string_helpers.h
View File

@ -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

10
lib/string_helpers.c
View File

@ -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);