aboutsummaryrefslogtreecommitdiffstats
path: root/merge.c
diff options
context:
space:
mode:
authorstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2009-10-05 15:20:22 +0000
committerstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2009-10-05 15:20:22 +0000
commit7a01f29b1f5f66c81abaa07748b077ecb83bf5e3 (patch)
tree9d5814babae8532cdefa1f7383762ac03d79dc03 /merge.c
parent3e1eb937733c0916f8a6c9e3b12a7824902b353c (diff)
Fixed a size data type.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30329 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'merge.c')
-rw-r--r--merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge.c b/merge.c
index 6e83e7ddac..bedb342855 100644
--- a/merge.c
+++ b/merge.c
@@ -37,7 +37,7 @@ 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;