Avoid collison with error(), clean up code a bit.

[tcpdump] / print-chdlc.c

diff --git a/print-chdlc.c b/print-chdlc.c
index c1f3d346482820d90c345951ba726f3bc5033c9d..766ae3810c306148a1e10d8e7aeff08396fb9a09 100644 (file)
--- a/print-chdlc.c
+++ b/print-chdlc.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -56,7 +55,8 @@ chdlc_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, register co
 }
 
 u_int
-chdlc_print(netdissect_options *ndo, register const u_char *p, u_int length) {
+chdlc_print(netdissect_options *ndo, register const u_char *p, u_int length)
+{
        u_int proto;
 
        proto = EXTRACT_16BITS(&p[2]);
@@ -75,11 +75,9 @@ chdlc_print(netdissect_options *ndo, register const u_char *p, u_int length) {
        case ETHERTYPE_IP:
                ip_print(ndo, p, length);
                break;
-#ifdef INET6
        case ETHERTYPE_IPV6:
                ip6_print(ndo, p, length);
                break;
-#endif
        case CHDLC_TYPE_SLARP:
                chdlc_slarp_print(ndo, p, length);
                break;