[PATCH 2/2] lib/vsprintf.c: Further simplify uuid_string().

From: George Spelvin
Date: Mon May 11 2015 - 10:46:52 EST


Make the endianness permutation table do double duty by having it
list not source offsets, but destination offsets. Thus, it both puts
the bytes in the right order and skips the hyphens.

This further shrinks the code from 256 to 214 bytes. Eliminating
erratic branches probably helps speed, too.

Signed-off-by: George Spelvin <linux@xxxxxxxxxxx>
---
lib/vsprintf.c | 25 +++++++++----------------
1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index de7f5bde..38c1d87e 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1265,10 +1265,9 @@ char *uuid_string(char *buf, char *end, const u8 *addr,
struct printf_spec spec, const char *fmt)
{
char uuid[sizeof("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx")];
- char *p = uuid;
int i;
- static const u8 be[16] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15};
- static const u8 le[16] = {3,2,1,0,5,4,7,6,8,9,10,11,12,13,14,15};
+ static const u8 be[16] = {0,2,4,6,9,11,14,16,19,21,24,26,28,30,32,34};
+ static const u8 le[16] = {6,4,2,0,11,9,16,14,19,21,24,26,28,30,32,34};
const u8 *index = be;
const char *hex = hex_asc;

@@ -1284,20 +1283,14 @@ char *uuid_string(char *buf, char *end, const u8 *addr,
}

for (i = 0; i < 16; i++) {
- u8 byte = addr[index[i]];
- *p++ = hex[x >> 4];
- *p++ = hex[x & 0x0f];
- switch (i) {
- case 3:
- case 5:
- case 7:
- case 9:
- *p++ = '-';
- break;
- }
- }
+ u8 byte = addr[i];
+ char *p = uuid + index[i];

- *p = 0;
+ p[0] = hex[byte >> 4];
+ p[1] = hex[byte & 0x0f];
+ }
+ uuid[23] = uuid[18] = uuid[13] = uuid[8] = '-';
+ uuid[36] = 0;

return string(buf, end, uuid, spec);
}
--
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/