Fix spaces

[tcpdump] / extract.h

diff --git a/extract.h b/extract.h
index 713dd946238e98c226e15d5aea18f6874b5762f1..64c9d724fdecebdde30bc505367bb4659283955b 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)))
 
 /*
@@ -84,31 +84,31 @@
  * XXX - do we need to test for both 32-bit and 64-bit versions of those
  * architectures in all cases?
  */
-static inline uint16_t UNALIGNED_OK
+UNALIGNED_OK static inline uint16_t
 EXTRACT_BE_U_2(const void *p)
 {
        return ((uint16_t)ntohs(*(const uint16_t *)(p)));
 }
 
-static inline int16_t UNALIGNED_OK
+UNALIGNED_OK static inline int16_t
 EXTRACT_BE_S_2(const void *p)
 {
        return ((int16_t)ntohs(*(const int16_t *)(p)));
 }
 
-static inline uint32_t UNALIGNED_OK
+UNALIGNED_OK static inline uint32_t
 EXTRACT_BE_U_4(const void *p)
 {
        return ((uint32_t)ntohl(*(const uint32_t *)(p)));
 }
 
-static inline int32_t UNALIGNED_OK
+UNALIGNED_OK static inline int32_t
 EXTRACT_BE_S_4(const void *p)
 {
        return ((int32_t)ntohl(*(const int32_t *)(p)));
 }
 
-static inline uint64_t UNALIGNED_OK
+UNALIGNED_OK static inline uint64_t
 EXTRACT_BE_U_8(const void *p)
 {
        return ((uint64_t)(((uint64_t)ntohl(*((const uint32_t *)(p) + 0))) << 32 |
@@ -116,7 +116,7 @@ EXTRACT_BE_U_8(const void *p)
 
 }
 
-static inline int64_t UNALIGNED_OK
+UNALIGNED_OK static inline int64_t
 EXTRACT_BE_S_8(const void *p)
 {
        return ((int64_t)(((int64_t)ntohl(*((const uint32_t *)(p) + 0))) << 32 |
@@ -128,7 +128,7 @@ EXTRACT_BE_S_8(const void *p)
  * Extract an IPv4 address, which is in network byte order, and not
  * necessarily aligned, and provide the result in host byte order.
  */
-static inline uint32_t UNALIGNED_OK
+UNALIGNED_OK static inline uint32_t
 EXTRACT_IPV4_TO_HOST_ORDER(const void *p)
 {
        return ((uint32_t)ntohl(*(const uint32_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;
@@ -421,7 +421,7 @@ EXTRACT_IPV4_TO_NETWORK_ORDER(const void *p)
 
 #define EXTRACT_BE_S_6(p) \
        (((*((const uint8_t *)(p) + 0)) & 0x80) ? \
-         ((uint64_t)(((uint64_t)(*((const uint8_t *)(p) + 0)) << 40) | \
+          ((int64_t)(((uint64_t)(*((const uint8_t *)(p) + 0)) << 40) | \
                      ((uint64_t)(*((const uint8_t *)(p) + 1)) << 32) | \
                      ((uint64_t)(*((const uint8_t *)(p) + 2)) << 24) | \
                      ((uint64_t)(*((const uint8_t *)(p) + 3)) << 16) | \