aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-10-13 03:24:51 -0400
committerIngo Molnar <mingo@elte.hu>2009-10-13 03:24:59 -0400
commit2c96c142e941041973faab20ca3b82d57f435c5e (patch)
tree45188f0ecb3f4bb7408a7219f8fcd041d500235a /lib
parent3c355863fb32070a2800f41106519c5c3038623a (diff)
parent8ad807318fcd62aba0e18c7c7fbfcc1af3fcdbab (diff)
Merge branch 'tracing/urgent' into tracing/core
Merge reason: Pick up tracing/filters fix from the urgent queue, we will queue up dependent patches. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'lib')
-rw-r--r--lib/vsprintf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index b91839e9e892..33bed5e67a21 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1771,7 +1771,7 @@ int vsscanf(const char * buf, const char * fmt, va_list args)
1771 * advance both strings to next white space 1771 * advance both strings to next white space
1772 */ 1772 */
1773 if (*fmt == '*') { 1773 if (*fmt == '*') {
1774 while (!isspace(*fmt) && *fmt) 1774 while (!isspace(*fmt) && *fmt != '%' && *fmt)
1775 fmt++; 1775 fmt++;
1776 while (!isspace(*str) && *str) 1776 while (!isspace(*str) && *str)
1777 str++; 1777 str++;