kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

vsprintf: use TOLOWER whenever possible

Browse source 
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:
André Goddard Rosa 2009-12-14 18:00:58 -08:00 committed by Linus Torvalds
parent 7b9186f5eb
commit 08562cb27d
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/vsprintf.c
View file

@ -1034,8 +1034,8 @@ precision:
qualifier: qualifier:
/* get the conversion qualifier */ /* get the conversion qualifier */
spec->qualifier = -1; spec->qualifier = -1;
if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || if (*fmt == 'h' || TOLOWER(*fmt) == 'l' ||
*fmt == 'Z' || *fmt == 'z' || *fmt == 't') { TOLOWER(*fmt) == 'z' || *fmt == 't') {
spec->qualifier = *fmt++; spec->qualifier = *fmt++;
if (unlikely(spec->qualifier == *fmt)) { if (unlikely(spec->qualifier == *fmt)) {
if (spec->qualifier == 'l') { if (spec->qualifier == 'l') {
@ -1102,7 +1102,7 @@ qualifier:
spec->type = FORMAT_TYPE_LONG; spec->type = FORMAT_TYPE_LONG;
else else
spec->type = FORMAT_TYPE_ULONG; 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; spec->type = FORMAT_TYPE_SIZE_T;
} else if (spec->qualifier == 't') { } else if (spec->qualifier == 't') {
spec->type = FORMAT_TYPE_PTRDIFF; 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') { if (qualifier == 'l') {
long *ip = va_arg(args, long *); long *ip = va_arg(args, long *);
*ip = (str - buf); *ip = (str - buf);
} else if (qualifier == 'Z' || } else if (TOLOWER(qualifier) == 'z') {
qualifier == 'z') {
size_t *ip = va_arg(args, size_t *); size_t *ip = va_arg(args, size_t *);
*ip = (str - buf); *ip = (str - buf);
} else { } else {
@ -1540,7 +1539,7 @@ do { \
void *skip_arg; void *skip_arg;
if (qualifier == 'l') if (qualifier == 'l')
skip_arg = va_arg(args, long *); skip_arg = va_arg(args, long *);
else if (qualifier == 'Z' || qualifier == 'z') else if (TOLOWER(qualifier) == 'z')
skip_arg = va_arg(args, size_t *); skip_arg = va_arg(args, size_t *);
else else
skip_arg = va_arg(args, int *); skip_arg = va_arg(args, int *);
@ -1851,8 +1850,8 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
/* get conversion qualifier */ /* get conversion qualifier */
qualifier = -1; qualifier = -1;
if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || if (*fmt == 'h' || TOLOWER(*fmt) == 'l' ||
*fmt == 'Z' || *fmt == 'z') { TOLOWER(*fmt) == 'z') {
qualifier = *fmt++; qualifier = *fmt++;
if (unlikely(qualifier == *fmt)) { if (unlikely(qualifier == *fmt)) {
if (qualifier == 'h') { if (qualifier == 'h') {