Replace macros: BSWAP16, BSWAP32, BSWAP64 with glib-version.

XXX, people are not aware that expression of this macros might be evaluated multiple times, like:
 -  BSWAP16(tvb_get_letohs(tvb, off)) : \
 +  GUINT16_SWAP_LE_BE(tvb_get_letohs(tvb, off)) : \

Should be tvb_get_ntohs() called?


svn path=/trunk/; revision=53653

1 files changed, 4 insertions, 6 deletions

diff --git a/epan/dissectors/packet-null.c b/epan/dissectors/packet-null.c
index cbcf193b2a..1ba8c4695c 100644
--- a/epan/dissectors/packet-null.c
+++ b/epan/dissectors/packet-null.c
@@ -29,8 +29,6 @@
 #include <glib.h>
 #include <string.h>
 
-#include <wsutil/pint.h>
-
 #include <epan/packet.h>
 #include "packet-null.h"
 #include <epan/atalk-utils.h>
@@ -294,7 +292,7 @@ capture_null( const guchar *pd, int len, packet_counts *ld )
         null_header >>= 16;
       } else {
         /* Byte-swap it. */
-        null_header = BSWAP32(null_header);
+        null_header = GUINT32_SWAP_LE_BE(null_header);
       }
     } else {
       /*
@@ -308,7 +306,7 @@ capture_null( const guchar *pd, int len, packet_counts *ld )
          * type; that's in the lower 16 bits of "null_header", but
          * is byte-swapped.
          */
-        null_header = BSWAP16(null_header & 0xFFFF);
+        null_header = GUINT16_SWAP_LE_BE(null_header & 0xFFFF);
       }
     }
 
@@ -394,7 +392,7 @@ dissect_null(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         null_header >>= 16;
       } else {
         /* Byte-swap it. */
-        null_header = BSWAP32(null_header);
+        null_header = GUINT32_SWAP_LE_BE(null_header);
       }
     } else {
       /*
@@ -408,7 +406,7 @@ dissect_null(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
          * type; that's in the lower 16 bits of "null_header", but
          * is byte-swapped.
          */
-        null_header = BSWAP16(null_header & 0xFFFF);
+        null_header = GUINT16_SWAP_LE_BE(null_header & 0xFFFF);
       }
     }