diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2018-01-28 14:18:51 +0100 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2018-01-28 14:18:51 +0100 |
| commit | fe4ef2d22bcc1b89f16c30480f7bff4348d1a014 (patch) | |
| tree | ed9c92f15c460a4007da8db3160e47f1c912b330 /print-ascii.c | |
| parent | 88007d634c7c23928ab2f788aa65c6cca8bcbecc (diff) | |
| download | tcpdump-fe4ef2d22bcc1b89f16c30480f7bff4348d1a014.tar.gz | |
Use the EXTRACT_U_1() macro in some utility functions
Diffstat (limited to 'print-ascii.c')
| -rw-r--r-- | print-ascii.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/print-ascii.c b/print-ascii.c index 812e7677..bd87f6ac 100644 --- a/print-ascii.c +++ b/print-ascii.c @@ -110,8 +110,10 @@ hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *ident, i = 0; hsp = hexstuff; asp = asciistuff; while (--nshorts >= 0) { - s1 = *cp++; - s2 = *cp++; + s1 = EXTRACT_U_1(cp); + cp++; + s2 = EXTRACT_U_1(cp); + cp++; (void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff), " %02x%02x", s1, s2); hsp += HEXDUMP_HEXSTUFF_PER_SHORT; @@ -128,7 +130,8 @@ hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *ident, } } if (length & 1) { - s1 = *cp++; + s1 = EXTRACT_U_1(cp); + cp++; (void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff), " %02x", s1); hsp += 3; @@ -172,13 +175,15 @@ hex_print_with_offset(netdissect_options *ndo, ND_PRINT("%s0x%04x: ", ident, oset); oset += HEXDUMP_BYTES_PER_LINE; } - s = *cp++; - ND_PRINT(" %02x%02x", s, *cp++); + s = EXTRACT_U_1(cp); + cp++; + ND_PRINT(" %02x%02x", s, EXTRACT_U_1(cp)); + cp++; } if (length & 1) { if ((i % 8) == 0) ND_PRINT("%s0x%04x: ", ident, oset); - ND_PRINT(" %02x", *cp); + ND_PRINT(" %02x", EXTRACT_U_1(cp)); } } |