X-Git-Url: http://git.samba.org/samba.git/?p=obnox%2Fwireshark%2Fwip.git;a=blobdiff_plain;f=merge.c;h=b64d65baeedbb91ec3d94a4e10f4ab670d9383d7;hp=e8b79191e99239883bffeb795939afd0a992f1f1;hb=dc5ab1f85d35669f50a48b6df587b8779dac44c0;hpb=da6614540b7b4291962ac14c60df330cc2ff4751

diff --git a/merge.c b/merge.c
index e8b79191e9..b64d65baee 100644
--- a/merge.c
+++ b/merge.c
@@ -37,11 +37,11 @@ merge_open_in_files(int in_file_count, char *const *in_file_names,
                     int *err_fileno)
 {
   int i, j;
-  int files_size = in_file_count * sizeof(merge_in_file_t);
+  size_t files_size = in_file_count * sizeof(merge_in_file_t);
   merge_in_file_t *files;
   gint64 size;
 
-  files = g_malloc(files_size);
+  files = (merge_in_file_t *)g_malloc(files_size);
   *in_files = files;
 
   for (i = 0; i < in_file_count; i++) {
@@ -157,7 +157,7 @@ merge_read_packet(int in_file_count, merge_in_file_t in_files[], int *err,
 {
   int i;
   int ei = -1;
-  struct wtap_nstime tv = {(time_t)LONG_MAX, INT_MAX};
+  struct wtap_nstime tv = { sizeof(time_t) > sizeof(int) ? LONG_MAX : INT_MAX, INT_MAX };
   struct wtap_pkthdr *phdr;
 
   /*