Add a cast to the EXTRACT_U_1() macro

[tcpdump] / extract.h

diff --git a/extract.h b/extract.h
index 011fccf785534bf1833029efdc36b746e755b0ec..0ea84e925b4ba5a78b21fbb9f367c9ec74b4201f 100644 (file)
--- a/extract.h
+++ b/extract.h
@@ -25,7 +25,7 @@
  * For 8-bit values; needed to fetch a one-byte value.  Byte order
  * isn't relevant, and alignment isn't an issue.
  */
-#define EXTRACT_U_1(p) (*(p))
+#define EXTRACT_U_1(p) ((uint8_t)(*(p)))
 #define EXTRACT_S_1(p) ((int8_t)(*(p)))
 
 /*
@@ -329,7 +329,7 @@ EXTRACT_HE_U_2(const void *p)
        return val;
 }
 
-static inline uint16_t
+static inline int16_t
 EXTRACT_HE_S_2(const void *p)
 {
        int16_t val;
@@ -338,7 +338,7 @@ EXTRACT_HE_S_2(const void *p)
        return val;
 }
 
-static inline uint16_t
+static inline uint32_t
 EXTRACT_HE_U_4(const void *p)
 {
        uint32_t val;
@@ -347,7 +347,7 @@ EXTRACT_HE_U_4(const void *p)
        return val;
 }
 
-static inline uint16_t
+static inline int32_t
 EXTRACT_HE_S_4(const void *p)
 {
        int32_t val;