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-arp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'print-arp.c') diff --git a/print-arp.c b/print-arp.c index 69a86ce2..7c57870a 100644 --- a/print-arp.c +++ b/print-arp.c @@ -86,11 +86,11 @@ struct arp_pkthdr { #define ARP_HDRLEN 8 -#define HRD(ap) EXTRACT_BE_16BITS(&(ap)->ar_hrd) +#define HRD(ap) EXTRACT_BE_U_2(&(ap)->ar_hrd) #define HRD_LEN(ap) ((ap)->ar_hln) #define PROTO_LEN(ap) ((ap)->ar_pln) -#define OP(ap) EXTRACT_BE_16BITS(&(ap)->ar_op) -#define PRO(ap) EXTRACT_BE_16BITS(&(ap)->ar_pro) +#define OP(ap) EXTRACT_BE_U_2(&(ap)->ar_op) +#define PRO(ap) EXTRACT_BE_U_2(&(ap)->ar_pro) #define SHA(ap) (ar_sha(ap)) #define SPA(ap) (ar_spa(ap)) #define THA(ap) (ar_tha(ap)) @@ -153,12 +153,12 @@ struct atmarp_pkthdr { u_char aar_tpa[]; /* target protocol address */ #endif -#define ATMHRD(ap) EXTRACT_BE_16BITS(&(ap)->aar_hrd) +#define ATMHRD(ap) EXTRACT_BE_U_2(&(ap)->aar_hrd) #define ATMSHRD_LEN(ap) ((ap)->aar_shtl & ATMARP_LEN_MASK) #define ATMSSLN(ap) ((ap)->aar_sstl & ATMARP_LEN_MASK) #define ATMSPROTO_LEN(ap) ((ap)->aar_spln) -#define ATMOP(ap) EXTRACT_BE_16BITS(&(ap)->aar_op) -#define ATMPRO(ap) EXTRACT_BE_16BITS(&(ap)->aar_pro) +#define ATMOP(ap) EXTRACT_BE_U_2(&(ap)->aar_op) +#define ATMPRO(ap) EXTRACT_BE_U_2(&(ap)->aar_pro) #define ATMTHRD_LEN(ap) ((ap)->aar_thtl & ATMARP_LEN_MASK) #define ATMTSLN(ap) ((ap)->aar_tstl & ATMARP_LEN_MASK) #define ATMTPROTO_LEN(ap) ((ap)->aar_tpln) -- cgit v1.2.1