|
@@ -1604,8 +1604,7 @@ qualifier:
|
|
|
|
|
|
|
|
case 'p':
|
|
case 'p':
|
|
|
spec->type = FORMAT_TYPE_PTR;
|
|
spec->type = FORMAT_TYPE_PTR;
|
|
|
- return fmt - start;
|
|
|
|
|
- /* skip alnum */
|
|
|
|
|
|
|
+ return ++fmt - start;
|
|
|
|
|
|
|
|
case '%':
|
|
case '%':
|
|
|
spec->type = FORMAT_TYPE_PERCENT_CHAR;
|
|
spec->type = FORMAT_TYPE_PERCENT_CHAR;
|
|
@@ -1794,7 +1793,7 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
|
|
|
break;
|
|
break;
|
|
|
|
|
|
|
|
case FORMAT_TYPE_PTR:
|
|
case FORMAT_TYPE_PTR:
|
|
|
- str = pointer(fmt+1, str, end, va_arg(args, void *),
|
|
|
|
|
|
|
+ str = pointer(fmt, str, end, va_arg(args, void *),
|
|
|
spec);
|
|
spec);
|
|
|
while (isalnum(*fmt))
|
|
while (isalnum(*fmt))
|
|
|
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:
|
|
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))
|
|
while (isalnum(*fmt))
|
|
|
fmt++;
|
|
fmt++;
|
|
|
break;
|
|
break;
|