diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-10-05 03:30:10 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-10-05 03:30:10 -0400 |
| commit | 5d13379a4dba717fb75b749acc0f928c2c02db17 (patch) | |
| tree | ab5bf870206e6ea8e744390cdb37cb14f7e78257 /lib | |
| parent | 08dc8726d4be85bca793141c827574fd32a681bb (diff) | |
| parent | 374576a8b6f865022c0fd1ca62396889b23d66dd (diff) | |
Merge branch 'master' into for-2.6.33
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/vsprintf.c | 2 |
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++; |