Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code »

Commit 08562cb27da6a1472be15898173105b46801a73b

Authored by André Goddard Rosa
Committed by Linus Torvalds
1 parent 7b9186f5eb
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 1 changed file with 7 additions and 8 deletions Side-by-side Diff

... ... @@ -1034,8 +1034,8 @@
1034 1034 qualifier:
1035 1035 /* get the conversion qualifier */
1036 1036 spec->qualifier = -1;
1037   - if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' ||
1038   - *fmt == 'Z' || *fmt == 'z' || *fmt == 't') {
  1037 + if (*fmt == 'h' || TOLOWER(*fmt) == 'l' ||
  1038 + TOLOWER(*fmt) == 'z' || *fmt == 't') {
1039 1039 spec->qualifier = *fmt++;
1040 1040 if (unlikely(spec->qualifier == *fmt)) {
1041 1041 if (spec->qualifier == 'l') {
... ... @@ -1102,7 +1102,7 @@
1102 1102 spec->type = FORMAT_TYPE_LONG;
1103 1103 else
1104 1104 spec->type = FORMAT_TYPE_ULONG;
1105   - } else if (spec->qualifier == 'Z' || spec->qualifier == 'z') {
  1105 + } else if (TOLOWER(spec->qualifier) == 'z') {
1106 1106 spec->type = FORMAT_TYPE_SIZE_T;
1107 1107 } else if (spec->qualifier == 't') {
1108 1108 spec->type = FORMAT_TYPE_PTRDIFF;
... ... @@ -1249,8 +1249,7 @@
1249 1249 if (qualifier == 'l') {
1250 1250 long *ip = va_arg(args, long *);
1251 1251 *ip = (str - buf);
1252   - } else if (qualifier == 'Z' ||
1253   - qualifier == 'z') {
  1252 + } else if (TOLOWER(qualifier) == 'z') {
1254 1253 size_t *ip = va_arg(args, size_t *);
1255 1254 *ip = (str - buf);
1256 1255 } else {
... ... @@ -1540,7 +1539,7 @@
1540 1539 void *skip_arg;
1541 1540 if (qualifier == 'l')
1542 1541 skip_arg = va_arg(args, long *);
1543   - else if (qualifier == 'Z' || qualifier == 'z')
  1542 + else if (TOLOWER(qualifier) == 'z')
1544 1543 skip_arg = va_arg(args, size_t *);
1545 1544 else
1546 1545 skip_arg = va_arg(args, int *);
... ... @@ -1851,8 +1850,8 @@
1851 1850  
1852 1851 /* get conversion qualifier */
1853 1852 qualifier = -1;
1854   - if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' ||
1855   - *fmt == 'Z' || *fmt == 'z') {
  1853 + if (*fmt == 'h' || TOLOWER(*fmt) == 'l' ||
  1854 + TOLOWER(*fmt) == 'z') {
1856 1855 qualifier = *fmt++;
1857 1856 if (unlikely(qualifier == *fmt)) {
1858 1857 if (qualifier == 'h') {