diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2018-06-16 17:23:21 +0200 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2019-03-26 21:06:24 +0100 |
| commit | ee68aa36460d7efeca48747f33b7f2adc0900bfb (patch) | |
| tree | 72c1b65d29301835c0e064b433ea685fc856a68e /print-ascii.c | |
| parent | 1af20c3adc4dfef93de41d4fcd02f0aeb6bbfd4e (diff) | |
| download | tcpdump-ee68aa36460d7efeca48747f33b7f2adc0900bfb.tar.gz | |
Use the new GET_ macros instead of the EXTRACT_ ones
The exceptions are currently:
Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer.
An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer
pointer.
Diffstat (limited to 'print-ascii.c')
| -rw-r--r-- | print-ascii.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/print-ascii.c b/print-ascii.c index df3f36a1..8460f84b 100644 --- a/print-ascii.c +++ b/print-ascii.c @@ -70,7 +70,7 @@ ascii_print(netdissect_options *ndo, length = caplength; ND_PRINT("\n"); while (length > 0) { - s = EXTRACT_U_1(cp); + s = GET_U_1(cp); cp++; length--; if (s == '\r') { @@ -83,7 +83,7 @@ ascii_print(netdissect_options *ndo, * * In the middle of a line, just print a '.'. */ - if (length > 1 && EXTRACT_U_1(cp) != '\n') + if (length > 1 && GET_U_1(cp) != '\n') ND_PRINT("."); } else { if (!ND_ISGRAPH(s) && @@ -113,9 +113,9 @@ hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *ident, i = 0; hsp = hexstuff; asp = asciistuff; while (nshorts != 0) { - s1 = EXTRACT_U_1(cp); + s1 = GET_U_1(cp); cp++; - s2 = EXTRACT_U_1(cp); + s2 = GET_U_1(cp); cp++; (void)nd_snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff), " %02x%02x", s1, s2); @@ -134,7 +134,7 @@ hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *ident, nshorts--; } if (length & 1) { - s1 = EXTRACT_U_1(cp); + s1 = GET_U_1(cp); cp++; (void)nd_snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff), " %02x", s1); @@ -179,16 +179,16 @@ hex_print_with_offset(netdissect_options *ndo, ND_PRINT("%s0x%04x: ", ident, oset); oset += HEXDUMP_BYTES_PER_LINE; } - s = EXTRACT_U_1(cp); + s = GET_U_1(cp); cp++; - ND_PRINT(" %02x%02x", s, EXTRACT_U_1(cp)); + ND_PRINT(" %02x%02x", s, GET_U_1(cp)); cp++; nshorts--; } if (length & 1) { if ((i % 8) == 0) ND_PRINT("%s0x%04x: ", ident, oset); - ND_PRINT(" %02x", EXTRACT_U_1(cp)); + ND_PRINT(" %02x", GET_U_1(cp)); } } |