From: Francois-Xavier Le Bail Date: Sat, 19 May 2018 15:12:08 +0000 (+0200) Subject: Replace some double parentheses with single parentheses X-Git-Tag: tcpdump-4.99-bp~1172 X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/226c6a8d0f906493a5d450556b1d5522642f8e02 Replace some double parentheses with single parentheses --- diff --git a/print-cfm.c b/print-cfm.c index 943e41b0..45608256 100644 --- a/print-cfm.c +++ b/print-cfm.c @@ -40,7 +40,7 @@ struct cfm_common_header_t { }; #define CFM_VERSION 0 -#define CFM_EXTRACT_VERSION(x) (((x)&0x1f)) +#define CFM_EXTRACT_VERSION(x) ((x)&0x1f) #define CFM_EXTRACT_MD_LEVEL(x) (((x)&0xe0)>>5) #define CFM_OPCODE_CCM 1 @@ -77,7 +77,7 @@ static const float ccm_interval_base[8] = {0.0f, 0.003333f, 0.01f, 0.1f, 1.0f, 1 #define CCM_INTERVAL_MAX_MULTIPLIER 3.5 #define CFM_CCM_RDI_FLAG 0x80 -#define CFM_EXTRACT_CCM_INTERVAL(x) (((x)&0x07)) +#define CFM_EXTRACT_CCM_INTERVAL(x) ((x)&0x07) #define CFM_CCM_MD_FORMAT_8021 0 #define CFM_CCM_MD_FORMAT_NONE 1 diff --git a/print-lldp.c b/print-lldp.c index ee814fcc..90bde666 100644 --- a/print-lldp.c +++ b/print-lldp.c @@ -1045,7 +1045,7 @@ lldp_private_tia_print(netdissect_options *ndo, (EXTRACT_U_1(tptr + 15) >> 4)); ND_PRINT("\n\t Altitude resolution %u, altitude value 0x%x", (EXTRACT_BE_U_2(tptr + 15)>>6)&0x3f, - ((EXTRACT_BE_U_4(tptr + 16) & 0x3fffffff))); + (EXTRACT_BE_U_4(tptr + 16) & 0x3fffffff)); ND_PRINT("\n\t Datum %s (0x%02x)", tok2str(lldp_tia_location_datum_type_values, "unknown", EXTRACT_U_1(tptr + 20)), EXTRACT_U_1(tptr + 20)); diff --git a/print-medsa.c b/print-medsa.c index 349307e6..b7111ea7 100644 --- a/print-medsa.c +++ b/print-medsa.c @@ -68,8 +68,8 @@ struct medsa_pkthdr { #define CODE_ARP_MIRROR 4 #define CFI(medsa) (EXTRACT_U_1(medsa->port_trunc_codehi_cfi) & 0x01) #define PRI(medsa) (EXTRACT_U_1(medsa->pri_vidhi_codelo) >> 5) -#define VID(medsa) (((u_short)(EXTRACT_U_1(medsa->pri_vidhi_codelo) & 0xf) << 8 | \ - EXTRACT_U_1(medsa->vidlo))) +#define VID(medsa) ((u_short)(EXTRACT_U_1(medsa->pri_vidhi_codelo) & 0xf) << 8 | \ + EXTRACT_U_1(medsa->vidlo)) static const struct tok tag_values[] = { { TAG_TO_CPU, "To_CPU" }, diff --git a/print-rsvp.c b/print-rsvp.c index abc6b242..2875a175 100644 --- a/print-rsvp.c +++ b/print-rsvp.c @@ -1778,7 +1778,7 @@ rsvp_obj_print(netdissect_options *ndo, ND_PRINT("%s Action: %s (%u), Label type: %u", indent, tok2str(rsvp_obj_label_set_action_values, "Unknown", action), - action, ((EXTRACT_BE_U_4(obj_tptr) & 0x7F))); + action, (EXTRACT_BE_U_4(obj_tptr) & 0x7F)); switch (action) { case LABEL_SET_INCLUSIVE_RANGE: diff --git a/print-token.c b/print-token.c index 9d9e36ed..1f298d4d 100644 --- a/print-token.c +++ b/print-token.c @@ -77,7 +77,7 @@ #define DIRECTION(trp) ((EXTRACT_BE_U_2((trp)->token_rcf) & 0x0080) >> 7) #define LARGEST_FRAME(trp) ((EXTRACT_BE_U_2((trp)->token_rcf) & 0x0070) >> 4) #define RING_NUMBER(trp, x) ((EXTRACT_BE_U_2((trp)->token_rseg[x]) & 0xfff0) >> 4) -#define BRIDGE_NUMBER(trp, x) ((EXTRACT_BE_U_2((trp)->token_rseg[x]) & 0x000f)) +#define BRIDGE_NUMBER(trp, x) (EXTRACT_BE_U_2((trp)->token_rseg[x]) & 0x000f) #define SEGMENT_COUNT(trp) ((int)((RIF_LENGTH(trp) - 2) / 2)) struct token_header {