diff options
author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2018-01-04 13:26:39 +0100 |
---|---|---|
committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2018-01-04 13:26:39 +0100 |
commit | ff1c209392b2226b1f434b0fb2e54f82cfa1caee (patch) | |
tree | 3e24ecfe86fd3e942545228feabd3bc75dd4ac98 | |
parent | 4a28df231d469d78763dfaab9ee9ad4d0a73fca1 (diff) | |
download | tcpdump-ff1c209392b2226b1f434b0fb2e54f82cfa1caee.tar.gz |
Fix some Coccinelle warnings "a \ character appears outside of a #define"
-rw-r--r-- | print-802_11.c | 6 | ||||
-rw-r--r-- | print-icmp6.c | 2 | ||||
-rw-r--r-- | print-l2tp.c | 6 | ||||
-rw-r--r-- | print-lspping.c | 54 | ||||
-rw-r--r-- | print-mpcp.c | 4 | ||||
-rw-r--r-- | print-ppp.c | 2 | ||||
-rw-r--r-- | print-slow.c | 2 |
7 files changed, 38 insertions, 38 deletions
diff --git a/print-802_11.c b/print-802_11.c index 0593e294..354be1a4 100644 --- a/print-802_11.c +++ b/print-802_11.c @@ -2830,9 +2830,9 @@ print_radiotap_field(netdissect_options *ndo, * up the rate. */ htrate = - ieee80211_float_htrates \ - [mcs_index] \ - [((flags & IEEE80211_RADIOTAP_MCS_BANDWIDTH_MASK) == IEEE80211_RADIOTAP_MCS_BANDWIDTH_40 ? 1 : 0)] \ + ieee80211_float_htrates + [mcs_index] + [((flags & IEEE80211_RADIOTAP_MCS_BANDWIDTH_MASK) == IEEE80211_RADIOTAP_MCS_BANDWIDTH_40 ? 1 : 0)] [((flags & IEEE80211_RADIOTAP_MCS_SHORT_GI) ? 1 : 0)]; } else { /* diff --git a/print-icmp6.c b/print-icmp6.c index 83f0cc65..a0db5bbc 100644 --- a/print-icmp6.c +++ b/print-icmp6.c @@ -1192,7 +1192,7 @@ icmp6_print(netdissect_options *ndo, p = (const struct nd_router_advert *)dp; ND_TCHECK(p->nd_ra_retransmit); - ND_PRINT((ndo,"\n\thop limit %u, Flags [%s]" \ + ND_PRINT((ndo,"\n\thop limit %u, Flags [%s]" ", pref %s, router lifetime %us, reachable time %us, retrans time %us", EXTRACT_U_1(p->nd_ra_curhoplimit), bittok2str(icmp6_opt_ra_flag_values,"none",EXTRACT_U_1(p->nd_ra_flags_reserved)), diff --git a/print-l2tp.c b/print-l2tp.c index d900caa3..e45520a3 100644 --- a/print-l2tp.c +++ b/print-l2tp.c @@ -231,9 +231,9 @@ static char *l2tp_result_code_CDN[] = { "Call disconnected due to loss of carrier", "Call disconnected for the reason indicated in error code", "Call disconnected for administrative reasons", - "Call failed due to lack of appropriate facilities being " \ + "Call failed due to lack of appropriate facilities being " "available (temporary condition)", - "Call failed due to lack of appropriate facilities being " \ + "Call failed due to lack of appropriate facilities being " "available (permanent condition)", "Invalid destination", "Call failed due to no carrier detected", @@ -250,7 +250,7 @@ static char *l2tp_error_code_general[] = { "No general error", "No control connection exists yet for this LAC-LNS pair", "Length is wrong", - "One of the field values was out of range or " \ + "One of the field values was out of range or " "reserved field was non-zero" "Insufficient resources to handle this operation now", "The Session ID is invalid in this context", diff --git a/print-lspping.c b/print-lspping.c index 77dabf8d..686b8767 100644 --- a/print-lspping.c +++ b/print-lspping.c @@ -682,7 +682,7 @@ lspping_print(netdissect_options *ndo, ND_PRINT((ndo, "\n\t invalid subTLV length, should be 5")); subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */ } else { - subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv4 = \ + subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv4 = (const struct lspping_tlv_targetfec_subtlv_ldp_ipv4_t *)subtlv_tptr; ND_PRINT((ndo, "\n\t %s/%u", ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv4->prefix), @@ -696,7 +696,7 @@ lspping_print(netdissect_options *ndo, ND_PRINT((ndo, "\n\t invalid subTLV length, should be 17")); subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */ } else { - subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv6 = \ + subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv6 = (const struct lspping_tlv_targetfec_subtlv_ldp_ipv6_t *)subtlv_tptr; ND_PRINT((ndo, "\n\t %s/%u", ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv6->prefix), @@ -710,7 +710,7 @@ lspping_print(netdissect_options *ndo, ND_PRINT((ndo, "\n\t invalid subTLV length, should be 5")); subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */ } else { - subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv4 = \ + subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv4 = (const struct lspping_tlv_targetfec_subtlv_bgp_ipv4_t *)subtlv_tptr; ND_PRINT((ndo, "\n\t %s/%u", ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv4->prefix), @@ -724,7 +724,7 @@ lspping_print(netdissect_options *ndo, ND_PRINT((ndo, "\n\t invalid subTLV length, should be 17")); subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */ } else { - subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv6 = \ + subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv6 = (const struct lspping_tlv_targetfec_subtlv_bgp_ipv6_t *)subtlv_tptr; ND_PRINT((ndo, "\n\t %s/%u", ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv6->prefix), @@ -738,9 +738,9 @@ lspping_print(netdissect_options *ndo, ND_PRINT((ndo, "\n\t invalid subTLV length, should be 20")); subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */ } else { - subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4 = \ + subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4 = (const struct lspping_tlv_targetfec_subtlv_rsvp_ipv4_t *)subtlv_tptr; - ND_PRINT((ndo, "\n\t tunnel end-point %s, tunnel sender %s, lsp-id 0x%04x" \ + ND_PRINT((ndo, "\n\t tunnel end-point %s, tunnel sender %s, lsp-id 0x%04x" "\n\t tunnel-id 0x%04x, extended tunnel-id %s", ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->tunnel_endpoint), ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->tunnel_sender), @@ -756,9 +756,9 @@ lspping_print(netdissect_options *ndo, ND_PRINT((ndo, "\n\t invalid subTLV length, should be 56")); subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */ } else { - subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6 = \ + subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6 = (const struct lspping_tlv_targetfec_subtlv_rsvp_ipv6_t *)subtlv_tptr; - ND_PRINT((ndo, "\n\t tunnel end-point %s, tunnel sender %s, lsp-id 0x%04x" \ + ND_PRINT((ndo, "\n\t tunnel end-point %s, tunnel sender %s, lsp-id 0x%04x" "\n\t tunnel-id 0x%04x, extended tunnel-id %s", ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->tunnel_endpoint), ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->tunnel_sender), @@ -774,7 +774,7 @@ lspping_print(netdissect_options *ndo, ND_PRINT((ndo, "\n\t invalid subTLV length, should be 13")); subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */ } else { - subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4 = \ + subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4 = (const struct lspping_tlv_targetfec_subtlv_l3vpn_ipv4_t *)subtlv_tptr; ND_PRINT((ndo, "\n\t RD: %s, %s/%u", bgp_vpn_rd_print(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4->rd), @@ -789,7 +789,7 @@ lspping_print(netdissect_options *ndo, ND_PRINT((ndo, "\n\t invalid subTLV length, should be 25")); subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */ } else { - subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6 = \ + subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6 = (const struct lspping_tlv_targetfec_subtlv_l3vpn_ipv6_t *)subtlv_tptr; ND_PRINT((ndo, "\n\t RD: %s, %s/%u", bgp_vpn_rd_print(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6->rd), @@ -804,9 +804,9 @@ lspping_print(netdissect_options *ndo, ND_PRINT((ndo, "\n\t invalid subTLV length, should be 14")); subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */ } else { - subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt = \ + subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt = (const struct lspping_tlv_targetfec_subtlv_l2vpn_endpt_t *)subtlv_tptr; - ND_PRINT((ndo, "\n\t RD: %s, Sender VE ID: %u, Receiver VE ID: %u" \ + ND_PRINT((ndo, "\n\t RD: %s, Sender VE ID: %u, Receiver VE ID: %u" "\n\t Encapsulation Type: %s (%u)", bgp_vpn_rd_print(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt->rd), EXTRACT_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt->sender_ve_id), @@ -825,9 +825,9 @@ lspping_print(netdissect_options *ndo, ND_PRINT((ndo, "\n\t invalid subTLV length, should be 10")); subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */ } else { - subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old = \ + subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old = (const struct lspping_tlv_targetfec_subtlv_fec_128_pw_old *)subtlv_tptr; - ND_PRINT((ndo, "\n\t Remote PE: %s" \ + ND_PRINT((ndo, "\n\t Remote PE: %s" "\n\t PW ID: 0x%08x, PW Type: %s (%u)", ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old->remote_pe_address), EXTRACT_BE_U_4(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old->pw_id), @@ -844,9 +844,9 @@ lspping_print(netdissect_options *ndo, ND_PRINT((ndo, "\n\t invalid subTLV length, should be 14")); subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */ } else { - subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid = \ + subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid = (const struct lspping_tlv_targetfec_subtlv_fec_128_pw *)subtlv_tptr; - ND_PRINT((ndo, "\n\t Sender PE: %s, Remote PE: %s" \ + ND_PRINT((ndo, "\n\t Sender PE: %s, Remote PE: %s" "\n\t PW ID: 0x%08x, PW Type: %s (%u)", ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->sender_pe_address), ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->remote_pe_address), @@ -864,7 +864,7 @@ lspping_print(netdissect_options *ndo, } /* do we want to see an additionally subtlv hexdump ? */ if (ndo->ndo_vflag > 1 || subtlv_hexdump==TRUE) - print_unknown_data(ndo, tlv_tptr+sizeof(struct lspping_tlv_header), \ + print_unknown_data(ndo, tlv_tptr+sizeof(struct lspping_tlv_header), "\n\t ", lspping_subtlv_len); @@ -893,7 +893,7 @@ lspping_print(netdissect_options *ndo, ND_TCHECK_LEN(tlv_tptr, sizeof(struct lspping_tlv_downstream_map_t)); - tlv_ptr.lspping_tlv_downstream_map= \ + tlv_ptr.lspping_tlv_downstream_map= (const struct lspping_tlv_downstream_map_t *)tlv_tptr; /* that strange thing with the downstream map TLV is that until now @@ -921,9 +921,9 @@ lspping_print(netdissect_options *ndo, ND_TCHECK_LEN(tlv_tptr, sizeof(struct lspping_tlv_downstream_map_ipv4_t)); - tlv_ptr.lspping_tlv_downstream_map_ipv4= \ + tlv_ptr.lspping_tlv_downstream_map_ipv4= (const struct lspping_tlv_downstream_map_ipv4_t *)tlv_tptr; - ND_PRINT((ndo, "\n\t Downstream IP: %s" \ + ND_PRINT((ndo, "\n\t Downstream IP: %s" "\n\t Downstream Interface IP: %s", ipaddr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv4->downstream_ip), ipaddr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv4->downstream_interface))); @@ -941,9 +941,9 @@ lspping_print(netdissect_options *ndo, ND_TCHECK_LEN(tlv_tptr, sizeof(struct lspping_tlv_downstream_map_ipv4_unmb_t)); - tlv_ptr.lspping_tlv_downstream_map_ipv4_unmb= \ + tlv_ptr.lspping_tlv_downstream_map_ipv4_unmb= (const struct lspping_tlv_downstream_map_ipv4_unmb_t *)tlv_tptr; - ND_PRINT((ndo, "\n\t Downstream IP: %s" \ + ND_PRINT((ndo, "\n\t Downstream IP: %s" "\n\t Downstream Interface Index: 0x%08x", ipaddr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv4_unmb->downstream_ip), EXTRACT_BE_U_4(tlv_ptr.lspping_tlv_downstream_map_ipv4_unmb->downstream_interface))); @@ -961,9 +961,9 @@ lspping_print(netdissect_options *ndo, ND_TCHECK_LEN(tlv_tptr, sizeof(struct lspping_tlv_downstream_map_ipv6_t)); - tlv_ptr.lspping_tlv_downstream_map_ipv6= \ + tlv_ptr.lspping_tlv_downstream_map_ipv6= (const struct lspping_tlv_downstream_map_ipv6_t *)tlv_tptr; - ND_PRINT((ndo, "\n\t Downstream IP: %s" \ + ND_PRINT((ndo, "\n\t Downstream IP: %s" "\n\t Downstream Interface IP: %s", ip6addr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv6->downstream_ip), ip6addr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv6->downstream_interface))); @@ -981,9 +981,9 @@ lspping_print(netdissect_options *ndo, ND_TCHECK_LEN(tlv_tptr, sizeof(struct lspping_tlv_downstream_map_ipv6_unmb_t)); - tlv_ptr.lspping_tlv_downstream_map_ipv6_unmb= \ + tlv_ptr.lspping_tlv_downstream_map_ipv6_unmb= (const struct lspping_tlv_downstream_map_ipv6_unmb_t *)tlv_tptr; - ND_PRINT((ndo, "\n\t Downstream IP: %s" \ + ND_PRINT((ndo, "\n\t Downstream IP: %s" "\n\t Downstream Interface Index: 0x%08x", ip6addr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv6_unmb->downstream_ip), EXTRACT_BE_U_4(tlv_ptr.lspping_tlv_downstream_map_ipv6_unmb->downstream_interface))); @@ -1006,7 +1006,7 @@ lspping_print(netdissect_options *ndo, ND_TCHECK_LEN(tlv_tptr, sizeof(struct lspping_tlv_downstream_map_info_t)); - tlv_ptr.lspping_tlv_downstream_map_info= \ + tlv_ptr.lspping_tlv_downstream_map_info= (const struct lspping_tlv_downstream_map_info_t *)tlv_tptr; /* FIXME add hash-key type, depth limit, multipath processing */ diff --git a/print-mpcp.c b/print-mpcp.c index a2a022a6..5fa0a421 100644 --- a/print-mpcp.c +++ b/print-mpcp.c @@ -219,7 +219,7 @@ mpcp_print(netdissect_options *ndo, const u_char *pptr, u_int length) case MPCP_OPCODE_REG: ND_TCHECK_LEN(tptr, sizeof(struct mpcp_reg_t)); mpcp.reg = (const struct mpcp_reg_t *)tptr; - ND_PRINT((ndo, "\n\tAssigned-Port %u, Flags [ %s ]" \ + ND_PRINT((ndo, "\n\tAssigned-Port %u, Flags [ %s ]" "\n\tSync-Time %u ticks, Echoed-Pending-Grants %u", EXTRACT_BE_U_2(mpcp.reg->assigned_port), bittok2str(mpcp_reg_flag_values, "Reserved", EXTRACT_U_1(mpcp.reg->flags)), @@ -230,7 +230,7 @@ mpcp_print(netdissect_options *ndo, const u_char *pptr, u_int length) case MPCP_OPCODE_REG_ACK: ND_TCHECK_LEN(tptr, sizeof(struct mpcp_reg_ack_t)); mpcp.reg_ack = (const struct mpcp_reg_ack_t *)tptr; - ND_PRINT((ndo, "\n\tEchoed-Assigned-Port %u, Flags [ %s ]" \ + ND_PRINT((ndo, "\n\tEchoed-Assigned-Port %u, Flags [ %s ]" "\n\tEchoed-Sync-Time %u ticks", EXTRACT_BE_U_2(mpcp.reg_ack->echoed_assigned_port), bittok2str(mpcp_reg_ack_flag_values, "Reserved", EXTRACT_U_1(mpcp.reg_ack->flags)), diff --git a/print-ppp.c b/print-ppp.c index 31b87a24..8cd114b3 100644 --- a/print-ppp.c +++ b/print-ppp.c @@ -1101,7 +1101,7 @@ print_ipcp_config_options(netdissect_options *ndo, } ND_TCHECK_LEN(p + 2, IPCPOPT_IPCOMP_MINLEN); - ND_PRINT((ndo, "\n\t TCP Space %u, non-TCP Space %u" \ + ND_PRINT((ndo, "\n\t TCP Space %u, non-TCP Space %u" ", maxPeriod %u, maxTime %u, maxHdr %u", EXTRACT_BE_U_2(p + 4), EXTRACT_BE_U_2(p + 6), diff --git a/print-slow.c b/print-slow.c index 7d575374..dc2da076 100644 --- a/print-slow.c +++ b/print-slow.c @@ -415,7 +415,7 @@ slow_marker_lacp_print(netdissect_options *ndo, tlv_ptr.lacp_tlv_actor_partner_info = (const struct lacp_tlv_actor_partner_info_t *)tlv_tptr; - ND_PRINT((ndo, "\n\t System %s, System Priority %u, Key %u" \ + ND_PRINT((ndo, "\n\t System %s, System Priority %u, Key %u" ", Port %u, Port Priority %u\n\t State Flags [%s]", etheraddr_string(ndo, tlv_ptr.lacp_tlv_actor_partner_info->sys), EXTRACT_BE_U_2(tlv_ptr.lacp_tlv_actor_partner_info->sys_pri), |