Squelch some int-vs-long errors.

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))
 

diff --git a/print-forces.c b/print-forces.c
index ff79d6d5606da6513adb1b362d13fdc88fa8a8a3..a93e356fc07f0b600cda042921a47e21f8dc7983 100644 (file)
--- a/print-forces.c
+++ b/print-forces.c
@@ -98,7 +98,8 @@ sdatailv_print(register const u_char * pptr, register u_int len,
                        register const u_char *tdp = (u_char *) ILV_DATA(ilv);
                        char *ib = indent_pr(indent, 1);
                        printf("\n%s SPARSEDATA: type %x length %d\n", &ib[1],
-                              ntohl(ilv->type), ntohl(ilv->length));
+                              (u_int32_t)ntohl(ilv->type),
+                              (u_int32_t)ntohl(ilv->length));
                        printf("%s[", &ib[1]);
                        hex_print_with_offset(ib, tdp, tll, 0);
                        printf("\n%s]\n", &ib[1]);
@@ -494,8 +495,8 @@ print_metailv(register const u_char * pptr, register u_int len,
        char *ib = indent_pr(indent, 0);
        /* XXX: check header length */
        struct forces_ilv *ilv = (struct forces_ilv *)pptr;
-       printf("\n%sMetaID 0x%x length %d\n", ib, ntohl(ilv->type),
-              ntohl(ilv->length));
+       printf("\n%sMetaID 0x%x length %d\n", ib, (u_int32_t)ntohl(ilv->type),
+              (u_int32_t)ntohl(ilv->length));
        hex_print_with_offset("\n\t\t\t\t[", ILV_DATA(ilv), tll, 0);
        return 0;
 }
@@ -620,7 +621,8 @@ lfbselect_print(register const u_char * pptr, register u_int len,
        if (vflag >= 3) {
                printf("\n%s%s(Classid %x) instance %x\n",
                       ib, tok2str(ForCES_LFBs, NULL, ntohl(lfbs->class)),
-                      ntohl(lfbs->class), ntohl(lfbs->instance));
+                      (u_int32_t)ntohl(lfbs->class),
+                      (u_int32_t)ntohl(lfbs->instance));
        }
 
        otlv = (struct forces_tlv *)(lfbs + 1);
@@ -714,8 +716,9 @@ forces_type_print(register const u_char * pptr, const struct forcesh *fhdr _U_,
                        break;
        }
        if (tll) {
-               printf("\tMess TopTLV header: min %ld, total %d advertised %d ",
-                      sizeof(struct forces_tlv), tll, ntohs(tltlv->length));
+               printf("\tMess TopTLV header: min %lu, total %d advertised %d ",
+                      (unsigned long)sizeof(struct forces_tlv),
+                      tll, ntohs(tltlv->length));
                return -1;
        }
 
@@ -747,8 +750,8 @@ void forces_print(register const u_char * pptr, register u_int len)
        printf("\n\tForCES %s ", tops->s);
        if (!ForCES_HLN_VALID(mlen, len)) {
                printf
-                   ("Illegal ForCES pkt len - min %ld, total recvd %d, advertised %d ",
-                    sizeof(struct forcesh), len, ForCES_BLN(fhdr));
+                   ("Illegal ForCES pkt len - min %lu, total recvd %d, advertised %d ",
+                    (unsigned long)sizeof(struct forcesh), len, ForCES_BLN(fhdr));
                goto error;
        }