korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-18 11:54:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

lib/vsprintf.c: fix vscnprintf() if @size is == 0

Browse Source 
vscnprintf() should return 0 if @size is == 0.  Update the comment for it,
as @size is unsigned.

This change based on the code of commit
b903c0b889 ("lib: fix scnprintf() if @size
is == 0") moves the real fix into vscnprinf() from scnprintf() and makes
scnprintf() call vscnprintf(), thus avoid code duplication.

Signed-off-by: Anton Arapov <aarapov@redhat.com>
Acked-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Anton Arapov 2011-01-12 16:59:49 -08:00 committed by Linus Torvalds
parent a3f938bf6f
commit b921c69fb2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/vsprintf.c
View File

@ -1473,7 +1473,7 @@ EXPORT_SYMBOL(vsnprintf);
* @args: Arguments for the format string * @args: Arguments for the format string
* *
* The return value is the number of characters which have been written into * The return value is the number of characters which have been written into
* the @buf not including the trailing '\0'. If @size is <= 0 the function * the @buf not including the trailing '\0'. If @size is == 0 the function
* returns 0. * returns 0.
* *
* Call this function if you are already dealing with a va_list. * Call this function if you are already dealing with a va_list.
@ -1487,7 +1487,11 @@ int vscnprintf(char *buf, size_t size, const char *fmt, va_list args)
i = vsnprintf(buf, size, fmt, args); i = vsnprintf(buf, size, fmt, args);
return (i >= size) ? (size - 1) : i; if (likely(i < size))
return i;
if (size != 0)
return size - 1;
return 0;
} }
EXPORT_SYMBOL(vscnprintf); EXPORT_SYMBOL(vscnprintf);
@ -1535,14 +1539,10 @@ int scnprintf(char *buf, size_t size, const char *fmt, ...)
int i; int i;
va_start(args, fmt); va_start(args, fmt);
i = vsnprintf(buf, size, fmt, args); i = vscnprintf(buf, size, fmt, args);
va_end(args); va_end(args);
if (likely(i < size)) return i;
return i;
if (size != 0)
return size - 1;
return 0;
} }
EXPORT_SYMBOL(scnprintf); EXPORT_SYMBOL(scnprintf);