Squelch implicit 64-bit-to-32-bit conversion warnings.

svn path=/trunk/; revision=46650

9 files changed, 56 insertions, 42 deletions

diff --git a/wiretap/aethra.c b/wiretap/aethra.c
index c219ae84e4..6220fecf40 100644
--- a/wiretap/aethra.c
+++ b/wiretap/aethra.c
@@ -221,7 +221,7 @@ static gboolean aethra_read(wtap *wth, int *err, gchar **err_info,
 		 * XXX - if this is big, we might waste memory by
 		 * growing the buffer to handle it.
 		 */
-		packet_size = rec_size - (sizeof hdr - sizeof hdr.rec_size);
+		packet_size = rec_size - (guint32)(sizeof hdr - sizeof hdr.rec_size);
 		if (packet_size != 0) {
 			buffer_assure_space(wth->frame_buffer, packet_size);
 			if (!aethra_read_rec_data(wth->fh, buffer_start_ptr(wth->frame_buffer),
diff --git a/wiretap/catapult_dct2000.c b/wiretap/catapult_dct2000.c
index f12a4570b9..6a1daf76c7 100644
--- a/wiretap/catapult_dct2000.c
+++ b/wiretap/catapult_dct2000.c
@@ -753,12 +753,12 @@ catapult_dct2000_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
     /* Calculate time of this packet to write, relative to start of dump */
     if (phdr->ts.nsecs >= dct2000->start_time.nsecs) {
         write_timestamp_string(time_string,
-                               (long)(phdr->ts.secs - dct2000->start_time.secs),
+                               (int)(phdr->ts.secs - dct2000->start_time.secs),
                                (phdr->ts.nsecs - dct2000->start_time.nsecs) / 100000);
     }
     else {
         write_timestamp_string(time_string,
-                               (long)(phdr->ts.secs - dct2000->start_time.secs-1),
+                               (int)(phdr->ts.secs - dct2000->start_time.secs-1),
                                ((1000000000 + (phdr->ts.nsecs / 100000)) - (dct2000->start_time.nsecs / 100000)) % 10000);
     }
 
diff --git a/wiretap/erf.c b/wiretap/erf.c
index 3bf9df54de..b64c009260 100644
--- a/wiretap/erf.c
+++ b/wiretap/erf.c
@@ -651,7 +651,7 @@ static gboolean erf_dump(
 
       alignbytes = (8 - (other_phdr.erf.phdr.rlen % 8)) % 8;  /*calculate how much padding will be required */
       if(phdr->caplen < phdr->len){ /*if packet has been snapped, we need to round down what we output*/
-        round_down = (8 - alignbytes) % 8;
+        round_down = (8 - (guint)alignbytes) % 8;
         other_phdr.erf.phdr.rlen -= round_down;
       }else{
         other_phdr.erf.phdr.rlen += (gint16)alignbytes;
diff --git a/wiretap/file_wrappers.c b/wiretap/file_wrappers.c
index 6ba1588b83..8a54c051a4 100644
--- a/wiretap/file_wrappers.c
+++ b/wiretap/file_wrappers.c
@@ -150,14 +150,14 @@ struct wtap_reader {
 static int	/* gz_load */
 raw_read(FILE_T state, unsigned char *buf, unsigned int count, unsigned *have)
 {
-	int ret;
+	ssize_t ret;
 
 	*have = 0;
 	do {
 		ret = read(state->fd, buf + *have, count - *have);
 		if (ret <= 0)
 			break;
-		*have += ret;
+		*have += (unsigned)ret;
 		state->raw_pos += ret;
 	} while (*have < count);
 	if (ret < 0) {
@@ -427,8 +427,21 @@ zlib_fast_seek_add(FILE_T file, struct zlib_cur_seek_point *point, int bits, gin
 		} else
 			memcpy(val->data.zlib.window, point->window, ZLIB_WINSIZE);
 
-		val->data.zlib.adler = file->strm.adler;
-		val->data.zlib.total_out = file->strm.total_out;
+		/*
+		 * XXX - strm.adler is a uLong in at least some versions
+		 * of zlib, and uLong is an unsigned long in at least
+		 * some of those versions, which means it's 64-bit
+		 * on LP64 platforms, even though the checksum is
+		 * 32-bit.  We assume the actual Adler checksum
+		 * is in the lower 32 bits of strm.adler; as the
+		 * checksum in the file is only 32 bits, we save only
+		 * those lower 32 bits, and cast away any additional
+		 * bits to squelch warnings.
+		 *
+		 * The same applies to strm.total_out.
+		 */
+		val->data.zlib.adler = (guint32) file->strm.adler;
+		val->data.zlib.total_out = (guint32) file->strm.total_out;
 		g_ptr_array_add(file->fast_seek, val);
 	}
 }
@@ -1463,8 +1476,9 @@ gz_init(GZWFILE_T state)
 static int
 gz_comp(GZWFILE_T state, int flush)
 {
-    int ret, got;
-    unsigned have;
+    int ret;
+    ssize_t got;
+    ptrdiff_t have;
     z_streamp strm = &(state->strm);
 
     /* allocate memory if this is the first time through */
@@ -1478,14 +1492,14 @@ gz_comp(GZWFILE_T state, int flush)
            doing Z_FINISH then don't write until we get to Z_STREAM_END */
         if (strm->avail_out == 0 || (flush != Z_NO_FLUSH &&
             (flush != Z_FINISH || ret == Z_STREAM_END))) {
-            have = (unsigned)(strm->next_out - state->next);
+            have = strm->next_out - state->next;
             if (have) {
 		got = write(state->fd, state->next, have);
 		if (got < 0) {
                     state->err = errno;
                     return -1;
                 }
-                if ((unsigned)got != have) {
+                if ((ptrdiff_t)got != have) {
                     state->err = WTAP_ERR_SHORT_WRITE;
                     return -1;
                 }
diff --git a/wiretap/mime_file.c b/wiretap/mime_file.c
index eb5f3ac239..6c76ad82ba 100644
--- a/wiretap/mime_file.c
+++ b/wiretap/mime_file.c
@@ -154,7 +154,7 @@ mime_file_open(wtap *wth, int *err, gchar **err_info)
 	for (i = 0; i < N_MAGIC_TYPES; i++)
 		read_bytes = MAX(read_bytes, magic_files[i].magic_len);
 
-	read_bytes = MIN(read_bytes, sizeof(magic_buf));
+	read_bytes = (guint)MIN(read_bytes, sizeof(magic_buf));
 	bytes_read = file_read(magic_buf, read_bytes, wth->fh);
 
 	if (bytes_read > 0) {
diff --git a/wiretap/mp2t.c b/wiretap/mp2t.c
index b6538ef2d2..e80faf5e89 100644
--- a/wiretap/mp2t.c
+++ b/wiretap/mp2t.c
@@ -118,7 +118,7 @@ mp2t_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset)
      */
     tmp = ((guint64)(*data_offset - mp2t->start_offset) * 8);	/* offset, in bits */
     wth->phdr.ts.secs = tmp / MP2T_QAM256_BITRATE;
-    wth->phdr.ts.nsecs = (tmp % MP2T_QAM256_BITRATE) * 1000000000 / MP2T_QAM256_BITRATE;
+    wth->phdr.ts.nsecs = (int)((tmp % MP2T_QAM256_BITRATE) * 1000000000 / MP2T_QAM256_BITRATE);
 
     wth->phdr.caplen = MP2T_SIZE;
     wth->phdr.len = MP2T_SIZE;
diff --git a/wiretap/netscaler.c b/wiretap/netscaler.c
index 04f19e4002..faa79a90f6 100644
--- a/wiretap/netscaler.c
+++ b/wiretap/netscaler.c
@@ -82,7 +82,7 @@ typedef struct nspr_header_v10
     guint8 ph_RecordType[2]; /* Record Type */
     guint8 ph_RecordSize[2]; /* Record Size including header */
 } nspr_header_v10_t;
-#define nspr_header_v10_s    sizeof(nspr_header_v10_t)
+#define nspr_header_v10_s    ((guint32)sizeof(nspr_header_v10_t))
 
 /* This is V20 short header (2 bytes long) to be included where needed */
 #define NSPR_HEADER_V20(prefix) \
@@ -104,7 +104,7 @@ typedef struct nspr_hd_v20
     NSPR_HEADER3B_V20(phd); /* long performance header */
 
 } nspr_hd_v20_t;
-#define nspr_hd_v20_s    sizeof(nspr_hd_v20_t)
+#define nspr_hd_v20_s    ((guint32)sizeof(nspr_hd_v20_t))
 
 
 /*
@@ -121,19 +121,19 @@ typedef struct nspr_headerdev_v10
     guint8 ph_RecordSize[2]; /* Record Size including header */
     guint8 ph_DevNo[4];      /* Network Device (NIC/CONN) number */
 } nspr_headerdev_v10_t;
-#define nspr_headerdev_v10_s    sizeof(nspr_headerdev_v10_t)
+#define nspr_headerdev_v10_s    ((guint32)sizeof(nspr_headerdev_v10_t))
 
 typedef struct nspr_hd_v10
 {
     nspr_header_v10_t phd; /* performance header */
 } nspr_hd_v10_t;
-#define nspr_hd_v10_s    sizeof(nspr_hd_v10_t)
+#define nspr_hd_v10_s    ((guint32)sizeof(nspr_hd_v10_t))
 
 typedef struct nspr_hdev_v10
 {
     nspr_headerdev_v10_t phd; /* performance header */
 } nspr_hdev_v10_t;
-#define nspr_hdev_v10_s    sizeof(nspr_hdev_v10_t)
+#define nspr_hdev_v10_s    ((guint32)sizeof(nspr_hdev_v10_t))
 
 /* if structure has defined phd as first field, it can use following names */
 #define nsprRecordType    phd.ph_RecordType
@@ -152,7 +152,7 @@ typedef struct nspr_signature_v10
     guint8 sig_Reserved1[2];
     gchar sig_Signature[NSPR_SIGSIZE_V10]; /* Signature value */
 } nspr_signature_v10_t;
-#define nspr_signature_v10_s    sizeof(nspr_signature_v10_t)
+#define nspr_signature_v10_s    ((guint32)sizeof(nspr_signature_v10_t))
 
 /* NSPR_SIGNATURE_V20 structure */
 #define NSPR_SIGSIZE_V20        sizeof(NSPR_SIGSTR_V20) /* signature value size in bytes */
@@ -162,7 +162,7 @@ typedef struct nspr_signature_v20
     guint8 sig_EndianType; /* Endian Type for the data */
     gchar sig_Signature[NSPR_SIGSIZE_V20]; /* Signature value */
 } nspr_signature_v20_t;
-#define nspr_signature_v20_s    sizeof(nspr_signature_v20_t)
+#define nspr_signature_v20_s    ((guint32)sizeof(nspr_signature_v20_t))
 
 /* NSPR_ABSTIME_V10 and NSPR_SYSTARTIME_V10 structure */
 typedef struct nspr_abstime_v10
@@ -171,7 +171,7 @@ typedef struct nspr_abstime_v10
     guint8 abs_RelTime[4]; /* relative time is ms from last time */
     guint8 abs_Time[4];    /* absolute time in seconds from 1970 */
 } nspr_abstime_v10_t;
-#define nspr_abstime_v10_s    sizeof(nspr_abstime_v10_t)
+#define nspr_abstime_v10_s    ((guint32)sizeof(nspr_abstime_v10_t))
 
 
 /* NSPR_ABSTIME_V20 and NSPR_SYSTARTIME_V20 structure */
@@ -181,7 +181,7 @@ typedef struct nspr_abstime_v20
     guint8 abs_RelTime[2]; /* relative time is ms from last time */
     guint8 abs_Time[4];    /* absolute time in seconds from 1970 */
 } nspr_abstime_v20_t;
-#define nspr_abstime_v20_s    sizeof(nspr_abstime_v20_t)
+#define nspr_abstime_v20_s    ((guint32)sizeof(nspr_abstime_v20_t))
 
 
 
@@ -202,7 +202,7 @@ typedef struct nspr_pktracefull_v20
     guint8 fp_RelTimeHr[4]; /* High resolution relative time */
     guint8 fp_Data[4];      /* packet data starts here */
 } nspr_pktracefull_v20_t;
-#define nspr_pktracefull_v20_s    (sizeof(nspr_pktracefull_v20_t) - 4)
+#define nspr_pktracefull_v20_s    ((guint32)(sizeof(nspr_pktracefull_v20_t) - 4))
 
 /* new full packet trace structure v21 */
 typedef struct nspr_pktracefull_v21
@@ -214,7 +214,7 @@ typedef struct nspr_pktracefull_v21
     guint8 fp_lPcbDevNo[4]; /* link PCB devno */
     guint8 fp_Data[4];      /* packet data starts here */
 } nspr_pktracefull_v21_t;
-#define nspr_pktracefull_v21_s    (sizeof(nspr_pktracefull_v21_t) - 4)
+#define nspr_pktracefull_v21_s    ((guint32)(sizeof(nspr_pktracefull_v21_t) - 4))
 
 /* new full packet trace structure v22 */
 typedef struct nspr_pktracefull_v22
@@ -227,7 +227,7 @@ typedef struct nspr_pktracefull_v22
     guint8 fp_VlanTag[2];   /* vlan tag */
     guint8 fp_Data[2];      /* packet data starts here */
 } nspr_pktracefull_v22_t;
-#define nspr_pktracefull_v22_s    (sizeof(nspr_pktracefull_v22_t) - 2)
+#define nspr_pktracefull_v22_s    ((guint32)(sizeof(nspr_pktracefull_v22_t) - 2))
 
 typedef struct nspr_pktracefull_v23
 {
@@ -240,7 +240,7 @@ typedef struct nspr_pktracefull_v23
     guint8 fp_Coreid[2];    /* coreid of the packet */
     guint8 fp_Data[2];      /* packet data starts here */
 } nspr_pktracefull_v23_t;
-#define nspr_pktracefull_v23_s    (sizeof(nspr_pktracefull_v23_t) - 2)
+#define nspr_pktracefull_v23_s    ((guint32)(sizeof(nspr_pktracefull_v23_t) - 2))
 
 /* New full packet trace structure v24 for cluster tracing */
 typedef struct nspr_pktracefull_v24
@@ -257,7 +257,7 @@ typedef struct nspr_pktracefull_v24
     guint8 fp_clFlags;       /* cluster flags */
     guint8 fp_Data[2];       /* packet data starts here */
 } nspr_pktracefull_v24_t;
-#define nspr_pktracefull_v24_s    (sizeof(nspr_pktracefull_v24_t) - 4)
+#define nspr_pktracefull_v24_s    ((guint32)(sizeof(nspr_pktracefull_v24_t) - 4))
 
 /* New full packet trace structure v25 for vm info tracing */
 typedef struct nspr_pktracefull_v25
@@ -276,7 +276,7 @@ typedef struct nspr_pktracefull_v25
     guint8 fp_dst_vmname_len; /* vm src info */
     guint8 fp_Data[4];        /* packet data starts here */
 } nspr_pktracefull_v25_t;
-#define nspr_pktracefull_v25_s    (sizeof(nspr_pktracefull_v25_t) - 4)
+#define nspr_pktracefull_v25_s    ((guint32)(sizeof(nspr_pktracefull_v25_t) - 4))
 #define fp_src_vmname    fp_Data
 #define fp_src_vmname    fp_Data
 
@@ -302,7 +302,7 @@ typedef struct nspr_pktracepart_v20
     guint8 pp_PktOffset[2];  /* starting offset in packet */
     guint8 pp_Data[4];       /* packet data starts here */
 } nspr_pktracepart_v20_t;
-#define nspr_pktracepart_v20_s    (sizeof(nspr_pktracepart_v20_t) -4)
+#define nspr_pktracepart_v20_s    ((guint32)(sizeof(nspr_pktracepart_v20_t) -4))
 
 /* new partial packet trace structure */
 typedef struct nspr_pktracepart_v21
@@ -316,7 +316,7 @@ typedef struct nspr_pktracepart_v21
     guint8 pp_lPcbDevNo[4];  /* link PCB devno */
     guint8 pp_Data[4];       /* packet data starts here */
 } nspr_pktracepart_v21_t;
-#define nspr_pktracepart_v21_s    (sizeof(nspr_pktracepart_v21_t) -4)
+#define nspr_pktracepart_v21_s    ((guint32)(sizeof(nspr_pktracepart_v21_t) -4))
 
 /* new partial packet trace structure v22 */
 typedef struct nspr_pktracepart_v22
@@ -331,7 +331,7 @@ typedef struct nspr_pktracepart_v22
     guint8 pp_VlanTag[2];    /* Vlan Tag */
     guint8 pp_Data[2];       /* packet data starts here */
 } nspr_pktracepart_v22_t;
-#define nspr_pktracepart_v22_s    (sizeof(nspr_pktracepart_v22_t) -2)
+#define nspr_pktracepart_v22_s    ((guint32)(sizeof(nspr_pktracepart_v22_t) -2))
 
 typedef struct nspr_pktracepart_v23
 {
@@ -346,7 +346,7 @@ typedef struct nspr_pktracepart_v23
     guint8 pp_Coreid[2];     /* Coreid of the packet */
     guint8 pp_Data[4];       /* packet data starts here */
 } nspr_pktracepart_v23_t;
-#define nspr_pktracepart_v23_s    (sizeof(nspr_pktracepart_v23_t) -4)
+#define nspr_pktracepart_v23_s    ((guint32)(sizeof(nspr_pktracepart_v23_t) -4))
 
 /* New partial packet trace structure v24 for cluster tracing */
 typedef struct nspr_pktracepart_v24
@@ -365,7 +365,7 @@ typedef struct nspr_pktracepart_v24
     guint8 pp_clFlags;       /* cluster flags */
     guint8 pp_Data[4];       /* packet data starts here */
 } nspr_pktracepart_v24_t;
-#define nspr_pktracepart_v24_s    (sizeof(nspr_pktracepart_v24_t) -4)
+#define nspr_pktracepart_v24_s    ((guint32)(sizeof(nspr_pktracepart_v24_t) -4))
 
 /* New partial packet trace structure v25 for vm info tracing */
 typedef struct nspr_pktracepart_v25
@@ -386,7 +386,7 @@ typedef struct nspr_pktracepart_v25
     guint8 pp_dst_vmname_len; /* vm info */
     guint8 pp_Data[4];        /* packet data starts here */
 } nspr_pktracepart_v25_t;
-#define nspr_pktracepart_v25_s    (sizeof(nspr_pktracepart_v25_t) -4)
+#define nspr_pktracepart_v25_s    ((guint32)(sizeof(nspr_pktracepart_v25_t) -4))
 #define pp_src_vmname    pp_Data
 #define pp_dst_vmname    pp_Data
 
@@ -420,7 +420,7 @@ typedef struct nspr_pktracepart_v25
     (phdr)->presence_flags |= WTAP_HAS_CAP_LEN;\
     (phdr)->len =  pletohs(&pp->pp_PktSizeOrg) + nspr_pktracepart_v10_s;\
     (phdr)->caplen =  pletohs(&pp->nsprRecordSize);\
-    TRACE_V10_REC_LEN_OFF(phdr,enumprefix,structprefix,structname)        
+    TRACE_V10_REC_LEN_OFF(phdr,enumprefix,structprefix,structname)
 
 #define TRACE_V20_REC_LEN_OFF(phdr,enumprefix,structprefix,structname) \
     __TNO(phdr,enumprefix,structprefix,structname,dir,RecordType)\
diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c
index 09cf088105..3df8acac43 100644
--- a/wiretap/pcapng.c
+++ b/wiretap/pcapng.c
@@ -2407,7 +2407,7 @@ pcapng_write_section_header_block(wtap_dumper *wdh, int *err)
 
         /* write block header */
         bh.block_type = BLOCK_TYPE_SHB;
-        bh.block_total_length = sizeof(bh) + sizeof(shb) + options_total_length + 4;
+        bh.block_total_length = (guint32)(sizeof(bh) + sizeof(shb) + options_total_length + 4);
         pcapng_debug2("pcapng_write_section_header_block: Total len %u, Options total len %u",bh.block_total_length, options_total_length);
 
         if (!wtap_dump_file_write(wdh, &bh, sizeof bh, err))
@@ -2671,7 +2671,7 @@ pcapng_write_if_descr_block(wtap_dumper *wdh, wtapng_if_descr_t *int_data, int *
 
         /* write block header */
         bh.block_type = BLOCK_TYPE_IDB;
-        bh.block_total_length = sizeof(bh) + sizeof(idb) + options_total_length + 4;
+        bh.block_total_length = (guint32)(sizeof(bh) + sizeof(idb) + options_total_length + 4);
 
         if (!wtap_dump_file_write(wdh, &bh, sizeof bh, err))
                 return FALSE;
@@ -2959,7 +2959,7 @@ pcapng_write_interface_statistics_block(wtap_dumper *wdh, wtapng_if_stats_t *if_
 
         /* write block header */
         bh.block_type = BLOCK_TYPE_ISB;
-        bh.block_total_length = sizeof(bh) + sizeof(isb) + options_total_length + 4;
+        bh.block_total_length = (guint32)(sizeof(bh) + sizeof(isb) + options_total_length + 4);
 
         if (!wtap_dump_file_write(wdh, &bh, sizeof bh, err))
                 return FALSE;
diff --git a/wiretap/vwr.c b/wiretap/vwr.c
index 94ddadc07a..573ff5f0bf 100644
--- a/wiretap/vwr.c
+++ b/wiretap/vwr.c
@@ -1127,7 +1127,7 @@ static void vwr_read_rec_data(wtap *wth, guint8 *data_ptr, guint8 *rec, int rec_
     wth->phdr.presence_flags = WTAP_HAS_TS;
 
     wth->phdr.ts.secs = (time_t)s_sec;
-    wth->phdr.ts.nsecs = (long)(s_usec * 1000);
+    wth->phdr.ts.nsecs = (int)(s_usec * 1000);
     wth->phdr.pkt_encap = WTAP_ENCAP_IXVERIWAVE;
 
     /* generate and copy out the radiotap header, set the port type to 0 (WLAN) */
@@ -1460,7 +1460,7 @@ static void vwr_read_rec_data_vVW510021(wtap *wth, guint8 *data_ptr, guint8 *rec
     wth->phdr.presence_flags = WTAP_HAS_TS;
 
     wth->phdr.ts.secs = (time_t)s_sec;
-    wth->phdr.ts.nsecs = (long)(s_usec * 1000);
+    wth->phdr.ts.nsecs = (int)(s_usec * 1000);
     wth->phdr.pkt_encap = WTAP_ENCAP_IXVERIWAVE;
 
     /* generate and copy out the radiotap header, set the port type to 0 (WLAN) */
@@ -1740,7 +1740,7 @@ static void vwr_read_rec_data_ethernet(wtap *wth, guint8 *data_ptr, guint8 *rec,
     wth->phdr.presence_flags = WTAP_HAS_TS;
 
     wth->phdr.ts.secs = (time_t)s_sec;
-    wth->phdr.ts.nsecs = (long)(s_usec * 1000);
+    wth->phdr.ts.nsecs = (int)(s_usec * 1000);
     wth->phdr.pkt_encap = WTAP_ENCAP_IXVERIWAVE;
 
     /* generate and copy out the ETHERNETTAP header, set the port type to 1 (Ethernet) */