From da20bc56d6100b5275d6f85c4a25bac1dab4e57e Mon Sep 17 00:00:00 2001 From: Francois-Xavier Le Bail Date: Wed, 22 Nov 2017 23:54:09 +0100 Subject: Rename EXTRACT_ macros Now all the macros have a name meaning a count in bytes. With _S_: signed, _U_: unsigned e.g.: EXTRACT_BE_32BITS -> EXTRACT_BE_U_4 EXTRACT_LE_32BITS -> EXTRACT_LE_U_4 ... EXTRACT_BE_INT32 -> EXTRACT_BE_S_4 and have: EXTRACT_8BITS -> EXTRACT_U_1 EXTRACT_INT8 -> EXTRACT_S_1 --- 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 69fe2c1c..869fbcb9 100644 --- a/print-ap1394.c +++ b/print-ap1394.c @@ -67,7 +67,7 @@ ap1394_hdr_print(netdissect_options *ndo, register const u_char *bp, u_int lengt fwaddr_string(ndo, fp->firewire_shost), fwaddr_string(ndo, fp->firewire_dhost))); - firewire_type = EXTRACT_BE_16BITS(&fp->firewire_type); + firewire_type = EXTRACT_BE_U_2(&fp->firewire_type); if (!ndo->ndo_qflag) { ND_PRINT((ndo, ", ethertype %s (0x%04x)", tok2str(ethertype_values,"Unknown", firewire_type), @@ -107,7 +107,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_16BITS(&fp->firewire_type); + ether_type = EXTRACT_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