CI: Add warning exemptions for Sun C (suncc-5.14) on Solaris 10

[tcpdump] / extract.h

diff --git a/extract.h b/extract.h
index 58b8cc19dd98ea6ee9670f59fa80a82d087a6750..5fb48d4fcea6cdd2b12e5c4fd2f5c3f97c0e4afd 100644 (file)
--- a/extract.h
+++ b/extract.h
@@ -148,7 +148,7 @@ EXTRACT_IPV4_TO_HOST_ORDER(const void *p)
  * cast the pointer to point to one of those, and fetch through it;
  * the GCC manual doesn't appear to explicitly say that
  * __attribute__((packed)) causes the compiler to generate unaligned-safe
- * code, but it apppears to do so.
+ * code, but it appears to do so.
  *
  * We do this in case the compiler can generate code using those
  * instructions to do an unaligned load and pass stuff to "ntohs()" or
@@ -260,7 +260,7 @@ EXTRACT_IPV4_TO_HOST_ORDER(const void *p)
  * quantities the hard way - fetch the bytes one at a time and
  * assemble them.
  *
- * XXX - ARM is a special case.  ARMv1 through ARMv5 didn't suppory
+ * XXX - ARM is a special case.  ARMv1 through ARMv5 didn't support
  * unaligned loads; ARMv6 and later support it *but* have a bit in
  * the system control register that the OS can set and that causes
  * unaligned loads to fault rather than succeeding.
@@ -414,7 +414,7 @@ EXTRACT_IPV4_TO_NETWORK_ORDER(const void *p)
                     ((uint64_t)(*((const uint8_t *)(p) + 2)) << 16) | \
                     ((uint64_t)(*((const uint8_t *)(p) + 3)) << 8) | \
                     ((uint64_t)(*((const uint8_t *)(p) + 4)) << 0))) : \
-         ((int64_t)(INT64_T_CONSTANT(0xFFFFFF0000000000U) | \
+         ((int64_t)(UINT64_C(0xFFFFFF0000000000) | \
                     ((uint64_t)(*((const uint8_t *)(p) + 0)) << 32) | \
                     ((uint64_t)(*((const uint8_t *)(p) + 1)) << 24) | \
                     ((uint64_t)(*((const uint8_t *)(p) + 2)) << 16) | \
@@ -437,7 +437,7 @@ EXTRACT_IPV4_TO_NETWORK_ORDER(const void *p)
                      ((uint64_t)(*((const uint8_t *)(p) + 3)) << 16) | \
                      ((uint64_t)(*((const uint8_t *)(p) + 4)) << 8) | \
                      ((uint64_t)(*((const uint8_t *)(p) + 5)) << 0))) : \
-         ((int64_t)(INT64_T_CONSTANT(0xFFFFFFFF00000000U) | \
+         ((int64_t)(UINT64_C(0xFFFFFFFF00000000) | \
                      ((uint64_t)(*((const uint8_t *)(p) + 0)) << 40) | \
                      ((uint64_t)(*((const uint8_t *)(p) + 1)) << 32) | \
                      ((uint64_t)(*((const uint8_t *)(p) + 2)) << 24) | \
@@ -463,7 +463,7 @@ EXTRACT_IPV4_TO_NETWORK_ORDER(const void *p)
                     ((uint64_t)(*((const uint8_t *)(p) + 4)) << 16) | \
                     ((uint64_t)(*((const uint8_t *)(p) + 5)) << 8) | \
                     ((uint64_t)(*((const uint8_t *)(p) + 6)) << 0))) : \
-           ((int64_t)(INT64_T_CONSTANT(0xFFFFFFFFFF000000U) | \
+           ((int64_t)(UINT64_C(0xFFFFFFFFFF000000) | \
                     ((uint64_t)(*((const uint8_t *)(p) + 0)) << 48) | \
                     ((uint64_t)(*((const uint8_t *)(p) + 1)) << 40) | \
                     ((uint64_t)(*((const uint8_t *)(p) + 2)) << 32) | \
@@ -575,19 +575,13 @@ EXTRACT_IPV4_TO_NETWORK_ORDER(const void *p)
 #define ND_TTEST_16(p) ND_TTEST_LEN((p), 16)
 #define ND_TCHECK_16(p) ND_TCHECK_LEN((p), 16)
 
-static inline NORETURN void
-nd_trunc(netdissect_options *ndo)
-{
-       longjmp(ndo->ndo_early_end, ND_TRUNCATED);
-}
-
 /* get_u_1 and get_s_1 */
 
 static inline uint8_t
 get_u_1(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_1(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_U_1(p);
 }
 
@@ -595,7 +589,7 @@ static inline int8_t
 get_s_1(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_1(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_S_1(p);
 }
 
@@ -605,7 +599,7 @@ static inline uint16_t
 get_be_u_2(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_2(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_BE_U_2(p);
 }
 
@@ -613,7 +607,7 @@ static inline uint32_t
 get_be_u_3(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_3(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_BE_U_3(p);
 }
 
@@ -621,7 +615,7 @@ static inline uint32_t
 get_be_u_4(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_4(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_BE_U_4(p);
 }
 
@@ -629,7 +623,7 @@ static inline uint64_t
 get_be_u_5(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_5(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_BE_U_5(p);
 }
 
@@ -637,7 +631,7 @@ static inline uint64_t
 get_be_u_6(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_6(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_BE_U_6(p);
 }
 
@@ -645,7 +639,7 @@ static inline uint64_t
 get_be_u_7(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_7(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_BE_U_7(p);
 }
 
@@ -653,7 +647,7 @@ static inline uint64_t
 get_be_u_8(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_8(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_BE_U_8(p);
 }
 
@@ -663,7 +657,7 @@ static inline int16_t
 get_be_s_2(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_2(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_BE_S_2(p);
 }
 
@@ -671,7 +665,7 @@ static inline int32_t
 get_be_s_3(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_3(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_BE_S_3(p);
 }
 
@@ -679,7 +673,7 @@ static inline int32_t
 get_be_s_4(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_4(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_BE_S_4(p);
 }
 
@@ -687,7 +681,7 @@ static inline int64_t
 get_be_s_5(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_5(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_BE_S_5(p);
 }
 
@@ -695,7 +689,7 @@ static inline int64_t
 get_be_s_6(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_6(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_BE_S_6(p);
 }
 
@@ -703,7 +697,7 @@ static inline int64_t
 get_be_s_7(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_7(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_BE_S_7(p);
 }
 
@@ -711,7 +705,7 @@ static inline int64_t
 get_be_s_8(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_8(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_BE_S_8(p);
 }
 
@@ -721,7 +715,7 @@ static inline uint16_t
 get_he_u_2(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_2(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_HE_U_2(p);
 }
 
@@ -729,7 +723,7 @@ static inline uint32_t
 get_he_u_4(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_4(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_HE_U_4(p);
 }
 
@@ -739,7 +733,7 @@ static inline int16_t
 get_he_s_2(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_2(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_HE_S_2(p);
 }
 
@@ -747,17 +741,47 @@ static inline int32_t
 get_he_s_4(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_4(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_HE_S_4(p);
 }
 
+/* get_be_f_N */
+
+static inline float
+get_be_f_4(netdissect_options *ndo, const u_char *p)
+{
+       union { /* int to float conversion buffer */
+               float f;
+               uint32_t i;
+       } buf;
+
+       if (!ND_TTEST_4(p))
+               nd_trunc_longjmp(ndo);
+       buf.i = EXTRACT_BE_U_4(p);
+       return buf.f;
+}
+
+static inline double
+get_be_f_8(netdissect_options *ndo, const u_char *p)
+{
+       union { /* int to float conversion buffer */
+               double f;
+               uint64_t i;
+       } buf;
+
+       if (!ND_TTEST_8(p))
+               nd_trunc_longjmp(ndo);
+       buf.i = EXTRACT_BE_U_8(p);
+       return buf.f;
+}
+
 /* get_le_u_N */
 
 static inline uint16_t
 get_le_u_2(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_2(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_LE_U_2(p);
 }
 
@@ -765,7 +789,7 @@ static inline uint32_t
 get_le_u_3(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_3(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_LE_U_3(p);
 }
 
@@ -773,7 +797,7 @@ static inline uint32_t
 get_le_u_4(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_4(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_LE_U_4(p);
 }
 
@@ -781,7 +805,7 @@ static inline uint64_t
 get_le_u_5(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_5(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_LE_U_5(p);
 }
 
@@ -789,7 +813,7 @@ static inline uint64_t
 get_le_u_6(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_6(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_LE_U_6(p);
 }
 
@@ -797,7 +821,7 @@ static inline uint64_t
 get_le_u_7(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_7(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_LE_U_7(p);
 }
 
@@ -805,7 +829,7 @@ static inline uint64_t
 get_le_u_8(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_8(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_LE_U_8(p);
 }
 
@@ -815,7 +839,7 @@ static inline int16_t
 get_le_s_2(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_2(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_LE_S_2(p);
 }
 
@@ -823,7 +847,7 @@ static inline int32_t
 get_le_s_3(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_3(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_LE_S_3(p);
 }
 
@@ -831,7 +855,7 @@ static inline int32_t
 get_le_s_4(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_4(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_LE_S_4(p);
 }
 
@@ -839,7 +863,7 @@ static inline int64_t
 get_le_s_8(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_8(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_LE_S_8(p);
 }
 
@@ -849,7 +873,7 @@ static inline uint32_t
 get_ipv4_to_host_order(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_4(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_IPV4_TO_HOST_ORDER(p);
 }
 
@@ -857,7 +881,7 @@ static inline uint32_t
 get_ipv4_to_network_order(netdissect_options *ndo, const u_char *p)
 {
        if (!ND_TTEST_4(p))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        return EXTRACT_IPV4_TO_NETWORK_ORDER(p);
 }
 
@@ -865,7 +889,7 @@ static inline void
 get_cpy_bytes(netdissect_options *ndo, u_char *dst, const u_char *p, size_t len)
 {
        if (!ND_TTEST_LEN(p, len))
-               nd_trunc(ndo);
+               nd_trunc_longjmp(ndo);
        UNALIGNED_MEMCPY(dst, p, len);
 }
 
@@ -888,6 +912,9 @@ get_cpy_bytes(netdissect_options *ndo, u_char *dst, const u_char *p, size_t len)
 #define GET_BE_S_7(p) get_be_s_7(ndo, (const u_char *)(p))
 #define GET_BE_S_8(p) get_be_s_8(ndo, (const u_char *)(p))
 
+#define GET_BE_F_4(p) get_be_f_4(ndo, (const u_char *)(p))
+#define GET_BE_F_8(p) get_be_f_8(ndo, (const u_char *)(p))
+
 #define GET_HE_U_2(p) get_he_u_2(ndo, (const u_char *)(p))
 #define GET_HE_U_4(p) get_he_u_4(ndo, (const u_char *)(p))