forked from Minki/linux
vsprintf: use TOLOWER whenever possible
It decreases code size as well: text data bss dec hex filename 15758 0 8 15766 3d96 vsprintf.o (ex lib/lib.a-BEFORE) 15726 0 8 15734 3d76 vsprintf.o (ex lib/lib.a-TOLOWER) Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com> Acked-by: Frederic Weisbecker <fweisbec@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:
parent
7b9186f5eb
commit
08562cb27d
@ -1034,8 +1034,8 @@ precision:
|
||||
qualifier:
|
||||
/* get the conversion qualifier */
|
||||
spec->qualifier = -1;
|
||||
if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' ||
|
||||
*fmt == 'Z' || *fmt == 'z' || *fmt == 't') {
|
||||
if (*fmt == 'h' || TOLOWER(*fmt) == 'l' ||
|
||||
TOLOWER(*fmt) == 'z' || *fmt == 't') {
|
||||
spec->qualifier = *fmt++;
|
||||
if (unlikely(spec->qualifier == *fmt)) {
|
||||
if (spec->qualifier == 'l') {
|
||||
@ -1102,7 +1102,7 @@ qualifier:
|
||||
spec->type = FORMAT_TYPE_LONG;
|
||||
else
|
||||
spec->type = FORMAT_TYPE_ULONG;
|
||||
} else if (spec->qualifier == 'Z' || spec->qualifier == 'z') {
|
||||
} else if (TOLOWER(spec->qualifier) == 'z') {
|
||||
spec->type = FORMAT_TYPE_SIZE_T;
|
||||
} else if (spec->qualifier == 't') {
|
||||
spec->type = FORMAT_TYPE_PTRDIFF;
|
||||
@ -1249,8 +1249,7 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
|
||||
if (qualifier == 'l') {
|
||||
long *ip = va_arg(args, long *);
|
||||
*ip = (str - buf);
|
||||
} else if (qualifier == 'Z' ||
|
||||
qualifier == 'z') {
|
||||
} else if (TOLOWER(qualifier) == 'z') {
|
||||
size_t *ip = va_arg(args, size_t *);
|
||||
*ip = (str - buf);
|
||||
} else {
|
||||
@ -1540,7 +1539,7 @@ do { \
|
||||
void *skip_arg;
|
||||
if (qualifier == 'l')
|
||||
skip_arg = va_arg(args, long *);
|
||||
else if (qualifier == 'Z' || qualifier == 'z')
|
||||
else if (TOLOWER(qualifier) == 'z')
|
||||
skip_arg = va_arg(args, size_t *);
|
||||
else
|
||||
skip_arg = va_arg(args, int *);
|
||||
@ -1851,8 +1850,8 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
|
||||
|
||||
/* get conversion qualifier */
|
||||
qualifier = -1;
|
||||
if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' ||
|
||||
*fmt == 'Z' || *fmt == 'z') {
|
||||
if (*fmt == 'h' || TOLOWER(*fmt) == 'l' ||
|
||||
TOLOWER(*fmt) == 'z') {
|
||||
qualifier = *fmt++;
|
||||
if (unlikely(qualifier == *fmt)) {
|
||||
if (qualifier == 'h') {
|
||||
|
Loading…
Reference in New Issue
Block a user