From 26c0e650a8c2bbe6fe969586e0b16be8e378fbcf Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Mon, 11 Jan 2010 00:44:14 -0800 Subject: [PATCH] --- yaml --- r: 183495 b: refs/heads/master c: c8e000604bce02a87742240a9b716a0f1b680c0b h: refs/heads/master i: 183493: 4477f4947a00bb9128f6213858dec0f3b009435a 183491: 84e32d5dbb1810e27f0e7401ac2ebb969c9d0f30 183487: dc96e8070f124808d7eaf2d639c3d8e37c949d8b v: v3 --- [refs] | 2 +- trunk/lib/vsprintf.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index ca06e1d1da53..94c486fa6ead 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4a66e752d0b19934dd208884f8605fe385aaaa9 +refs/heads/master: c8e000604bce02a87742240a9b716a0f1b680c0b diff --git a/trunk/lib/vsprintf.c b/trunk/lib/vsprintf.c index dc48d2b32ebd..e83e3e79a989 100644 --- a/trunk/lib/vsprintf.c +++ b/trunk/lib/vsprintf.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include /* for PAGE_SIZE */ @@ -682,19 +681,16 @@ static char *mac_address_string(char *buf, char *end, u8 *addr, char mac_addr[sizeof("xx:xx:xx:xx:xx:xx")]; char *p = mac_addr; int i; - bool bitrev; char separator; if (fmt[1] == 'F') { /* FDDI canonical format */ - bitrev = true; separator = '-'; } else { - bitrev = false; separator = ':'; } for (i = 0; i < 6; i++) { - p = pack_hex_byte(p, bitrev ? bitrev8(addr[i]) : addr[i]); + p = pack_hex_byte(p, addr[i]); if (fmt[0] == 'M' && i != 5) *p++ = separator; } @@ -908,9 +904,7 @@ static char *uuid_string(char *buf, char *end, const u8 *addr, * usual colon-separated hex notation * - 'm' For a 6-byte MAC address, it prints the hex address without colons * - 'MF' For a 6-byte MAC FDDI address, it prints the address - * with a dash-separated hex notation with bit reversed bytes - * - 'mF' For a 6-byte MAC FDDI address, it prints the address - * in hex notation without separators with bit reversed bytes + * with a dash-separated hex notation * - 'I' [46] for IPv4/IPv6 addresses printed in the usual way * IPv4 uses dot-separated decimal without leading 0's (1.2.3.4) * IPv6 uses colon separated network-order 16 bit hex with leading 0's