Squelch some int-vs-long errors.

[tcpdump] / forces.h

diff --git a/forces.h b/forces.h
index 9dff4a174df2916c051e38fe0191524c06a5ab28..98ac0121e94a737ea63361b68561cb5e648cbf97 100644 (file)
--- a/forces.h
+++ b/forces.h
@@ -200,23 +200,23 @@ struct forcesh {
 #define ForCES_V(forcesh)      ((forcesh)->fm_vrsvd >> 4)
        u_int8_t fm_tom;        /* type of message */
        u_int16_t fm_len;       /* total length * 4 bytes */
-#define ForCES_BLN(forcesh)    ntohs((forcesh)->fm_len) << 2
+#define ForCES_BLN(forcesh)    ((u_int32_t)(ntohs((forcesh)->fm_len) << 2))
        u_int32_t fm_sid;       /* Source ID */
-#define ForCES_SID(forcesh)    ntohl((forcesh)->fm_sid)
+#define ForCES_SID(forcesh)    ((u_int32_t)ntohl((forcesh)->fm_sid))
        u_int32_t fm_did;       /* Destination ID */
-#define ForCES_DID(forcesh)    ntohl((forcesh)->fm_did)
+#define ForCES_DID(forcesh)    ((u_int32_t)ntohl((forcesh)->fm_did))
        u_int8_t fm_cor[8];     /* correlator */
        u_int32_t fm_flags;     /* flags */
-#define ForCES_ACK(forcesh)    ((ntohl((forcesh)->fm_flags)&0xC0000000) >> 30)
-#define ForCES_PRI(forcesh)    ((ntohl((forcesh)->fm_flags)&0x38000000) >> 27)
-#define ForCES_RS1(forcesh)    ((ntohl((forcesh)->fm_flags)&0x07000000) >> 24)
-#define ForCES_EM(forcesh)     ((ntohl((forcesh)->fm_flags)&0x00C00000) >> 22)
-#define ForCES_AT(forcesh)     ((ntohl((forcesh)->fm_flags)&0x00200000) >> 21)
-#define ForCES_TP(forcesh)     ((ntohl((forcesh)->fm_flags)&0x00180000) >> 19)
-#define ForCES_RS2(forcesh)    ((ntohl((forcesh)->fm_flags)&0x0007FFFF) >> 0)
+#define ForCES_ACK(forcesh)    ((u_int32_t)((ntohl((forcesh)->fm_flags)&0xC0000000) >> 30))
+#define ForCES_PRI(forcesh)    ((u_int32_t)((ntohl((forcesh)->fm_flags)&0x38000000) >> 27))
+#define ForCES_RS1(forcesh)    ((u_int32_t)((ntohl((forcesh)->fm_flags)&0x07000000) >> 24))
+#define ForCES_EM(forcesh)     ((u_int32_t)((ntohl((forcesh)->fm_flags)&0x00C00000) >> 22))
+#define ForCES_AT(forcesh)     ((u_int32_t)((ntohl((forcesh)->fm_flags)&0x00200000) >> 21))
+#define ForCES_TP(forcesh)     ((u_int32_t)((ntohl((forcesh)->fm_flags)&0x00180000) >> 19))
+#define ForCES_RS2(forcesh)    ((u_int32_t)((ntohl((forcesh)->fm_flags)&0x0007FFFF) >> 0))
 };
 
-#define ForCES_HLN_VALID(fhl,tlen) ((tlen) >= (int)sizeof(struct forcesh) && \
+#define ForCES_HLN_VALID(fhl,tlen) ((tlen) >= sizeof(struct forcesh) && \
                                   (fhl) >= sizeof(struct forcesh) && \
                                   (fhl) == (tlen))