summaryrefslogtreecommitdiff
path: root/wiretap/mime_file.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2012-12-21 03:32:16 +0000
committerGuy Harris <guy@alum.mit.edu>2012-12-21 03:32:16 +0000
commit5996b49c531a8844b0d5e110ab435cbf3b3efed3 (patch)
tree7d185fc764e251ceaca4666ef22f240ffedb4a7a /wiretap/mime_file.c
parent9bfcd83721876d337580e8fdc26d18cd8d317093 (diff)
downloadwireshark-5996b49c531a8844b0d5e110ab435cbf3b3efed3.tar.gz
Squelch implicit 64-bit-to-32-bit conversion warnings.
svn path=/trunk/; revision=46650
Diffstat (limited to 'wiretap/mime_file.c')
-rw-r--r--wiretap/mime_file.c2
1 files changed, 1 insertions, 1 deletions
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) {