|
@@ -547,7 +547,7 @@ char *mac_address_string(char *buf, char *end, u8 *addr,
|
|
}
|
|
}
|
|
|
|
|
|
for (i = 0; i < 6; i++) {
|
|
for (i = 0; i < 6; i++) {
|
|
- p = pack_hex_byte(p, addr[i]);
|
|
|
|
|
|
+ p = hex_byte_pack(p, addr[i]);
|
|
if (fmt[0] == 'M' && i != 5)
|
|
if (fmt[0] == 'M' && i != 5)
|
|
*p++ = separator;
|
|
*p++ = separator;
|
|
}
|
|
}
|
|
@@ -667,13 +667,13 @@ char *ip6_compressed_string(char *p, const char *addr)
|
|
lo = word & 0xff;
|
|
lo = word & 0xff;
|
|
if (hi) {
|
|
if (hi) {
|
|
if (hi > 0x0f)
|
|
if (hi > 0x0f)
|
|
- p = pack_hex_byte(p, hi);
|
|
|
|
|
|
+ p = hex_byte_pack(p, hi);
|
|
else
|
|
else
|
|
*p++ = hex_asc_lo(hi);
|
|
*p++ = hex_asc_lo(hi);
|
|
- p = pack_hex_byte(p, lo);
|
|
|
|
|
|
+ p = hex_byte_pack(p, lo);
|
|
}
|
|
}
|
|
else if (lo > 0x0f)
|
|
else if (lo > 0x0f)
|
|
- p = pack_hex_byte(p, lo);
|
|
|
|
|
|
+ p = hex_byte_pack(p, lo);
|
|
else
|
|
else
|
|
*p++ = hex_asc_lo(lo);
|
|
*p++ = hex_asc_lo(lo);
|
|
needcolon = true;
|
|
needcolon = true;
|
|
@@ -695,8 +695,8 @@ char *ip6_string(char *p, const char *addr, const char *fmt)
|
|
int i;
|
|
int i;
|
|
|
|
|
|
for (i = 0; i < 8; i++) {
|
|
for (i = 0; i < 8; i++) {
|
|
- p = pack_hex_byte(p, *addr++);
|
|
|
|
- p = pack_hex_byte(p, *addr++);
|
|
|
|
|
|
+ p = hex_byte_pack(p, *addr++);
|
|
|
|
+ p = hex_byte_pack(p, *addr++);
|
|
if (fmt[0] == 'I' && i != 7)
|
|
if (fmt[0] == 'I' && i != 7)
|
|
*p++ = ':';
|
|
*p++ = ':';
|
|
}
|
|
}
|
|
@@ -754,7 +754,7 @@ char *uuid_string(char *buf, char *end, const u8 *addr,
|
|
}
|
|
}
|
|
|
|
|
|
for (i = 0; i < 16; i++) {
|
|
for (i = 0; i < 16; i++) {
|
|
- p = pack_hex_byte(p, addr[index[i]]);
|
|
|
|
|
|
+ p = hex_byte_pack(p, addr[index[i]]);
|
|
switch (i) {
|
|
switch (i) {
|
|
case 3:
|
|
case 3:
|
|
case 5:
|
|
case 5:
|