mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-16 09:13:55 +08:00
lib/vsprintf.c: consume 'p' in format_decode
It seems a little simpler to consume the p from a %p specifier in format_decode, just as it is done for the surrounding %c, %s and %% cases. While there, delete a redundant and misplaced comment. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Cc: Jiri Kosina <jkosina@suse.cz> Cc: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
205bd3d23e
commit
ffbfed03b4
@ -1604,8 +1604,7 @@ qualifier:
|
||||
|
||||
case 'p':
|
||||
spec->type = FORMAT_TYPE_PTR;
|
||||
return fmt - start;
|
||||
/* skip alnum */
|
||||
return ++fmt - start;
|
||||
|
||||
case '%':
|
||||
spec->type = FORMAT_TYPE_PERCENT_CHAR;
|
||||
@ -1794,7 +1793,7 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
|
||||
break;
|
||||
|
||||
case FORMAT_TYPE_PTR:
|
||||
str = pointer(fmt+1, str, end, va_arg(args, void *),
|
||||
str = pointer(fmt, str, end, va_arg(args, void *),
|
||||
spec);
|
||||
while (isalnum(*fmt))
|
||||
fmt++;
|
||||
@ -2232,7 +2231,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
|
||||
}
|
||||
|
||||
case FORMAT_TYPE_PTR:
|
||||
str = pointer(fmt+1, str, end, get_arg(void *), spec);
|
||||
str = pointer(fmt, str, end, get_arg(void *), spec);
|
||||
while (isalnum(*fmt))
|
||||
fmt++;
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user