From: Francois-Xavier Le Bail Date: Mon, 7 Feb 2022 10:12:35 +0000 (+0100) Subject: ICMPv6: Remove an unused macro and extra blank lines X-Git-Tag: tcpdump-4.99.2~73 X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/f6ca9678384fdbd15be60f52259ec9f42ca06cef ICMPv6: Remove an unused macro and extra blank lines [skip ci] (cherry picked from commit 5140300e4c7cb7b6cc25539adccf4bbf747d39fb) --- diff --git a/print-icmp6.c b/print-icmp6.c index f380be20..4bcf6404 100644 --- a/print-icmp6.c +++ b/print-icmp6.c @@ -490,10 +490,6 @@ static void dnsname_print(netdissect_options *ndo, const u_char *, const u_char static void icmp6_nodeinfo_print(netdissect_options *ndo, u_int, const u_char *, const u_char *); static void icmp6_rrenum_print(netdissect_options *ndo, const u_char *, const u_char *); -#ifndef abs -#define abs(a) ((0 < (a)) ? (a) : -(a)) -#endif - /* * DIO: Updated to RFC6550, as published in 2012: section 6. (page 30) */ @@ -711,7 +707,6 @@ static const struct tok icmp6_nd_na_flag_values[] = { { 0, NULL } }; - static const struct tok icmp6_opt_values[] = { { ND_OPT_SOURCE_LINKADDR, "source link-address"}, { ND_OPT_TARGET_LINKADDR, "destination link-address"}, @@ -1015,7 +1010,6 @@ trunc: } - void icmp6_print(netdissect_options *ndo, const u_char *bp, u_int length, const u_char *bp2, int fragmented) @@ -1776,7 +1770,6 @@ icmp6_nodeinfo_print(netdissect_options *ndo, u_int icmp6len, const u_char *bp, break; } - /* XXX backward compat, icmp-name-lookup-03 */ if (siz == sizeof(*ni6)) { ND_PRINT(", 03 draft");