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

[tcpdump] / print-802_15_4.c

diff --git a/print-802_15_4.c b/print-802_15_4.c
index d60503dab8cf0ded3140710a9848fe96118f7715..b41e15ac56168bd045922670a2b41bef9b663326 100644 (file)
--- a/print-802_15_4.c
+++ b/print-802_15_4.c
@@ -20,7 +20,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -44,7 +43,7 @@ static const char *ftypes[] = {
 };
 
 static int
-extract_header_length(u_int16_t fc)
+extract_header_length(uint16_t fc)
 {
        int len = 0;
 
@@ -92,8 +91,8 @@ ieee802_15_4_if_print(netdissect_options *ndo,
 {
        u_int caplen = h->caplen;
        int hdrlen;
-       u_int16_t fc;
-       u_int8_t seq;
+       uint16_t fc;
+       uint8_t seq;
 
        if (caplen < 3) {
                ND_PRINT((ndo, "[|802.15.4] %x", caplen));
@@ -121,7 +120,7 @@ ieee802_15_4_if_print(netdissect_options *ndo,
                p+= hdrlen;
                caplen -= hdrlen;
        } else {
-               u_int16_t panid = 0;
+               uint16_t panid = 0;
 
                switch ((fc >> 10) & 0x3) {
                case 0x00:
@@ -143,7 +142,7 @@ ieee802_15_4_if_print(netdissect_options *ndo,
                        p += 8;
                        break;
                }
-               ND_PRINT((ndo,"< ");
+               ND_PRINT((ndo,"< "));
 
                switch ((fc >> 14) & 0x3) {
                case 0x00:
@@ -165,7 +164,7 @@ ieee802_15_4_if_print(netdissect_options *ndo,
                                panid = EXTRACT_LE_16BITS(p);
                                p += 2;
                        }
-                        ND_PRINT((ndo,"%04x:%s ", panid, le64addr_string(p))));
+                        ND_PRINT((ndo,"%04x:%s ", panid, le64addr_string(p)));
                        p += 8;
                        break;
                }