From ee68aa36460d7efeca48747f33b7f2adc0900bfb Mon Sep 17 00:00:00 2001 From: Francois-Xavier Le Bail Date: Sat, 16 Jun 2018 17:23:21 +0200 Subject: 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. --- print-ap1394.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'print-ap1394.c') diff --git a/print-ap1394.c b/print-ap1394.c index d401153c..9dd6ee95 100644 --- a/print-ap1394.c +++ b/print-ap1394.c @@ -67,7 +67,7 @@ ap1394_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length) fwaddr_string(ndo, fp->firewire_shost), fwaddr_string(ndo, fp->firewire_dhost)); - firewire_type = EXTRACT_BE_U_2(fp->firewire_type); + firewire_type = GET_BE_U_2(fp->firewire_type); if (!ndo->ndo_qflag) { ND_PRINT(", ethertype %s (0x%04x)", tok2str(ethertype_values,"Unknown", firewire_type), @@ -108,7 +108,7 @@ ap1394_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch fp = (const struct firewire_header *)p; p += FIREWIRE_HDRLEN; - ether_type = EXTRACT_BE_U_2(fp->firewire_type); + ether_type = GET_BE_U_2(fp->firewire_type); src.addr = fp->firewire_shost; src.addr_string = fwaddr_string; dst.addr = fp->firewire_dhost; -- cgit v1.2.1