summaryrefslogtreecommitdiff
path: root/file.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-02-10 17:48:46 -0800
committerGuy Harris <guy@alum.mit.edu>2016-02-11 01:49:49 +0000
commit01a3873505e6f5c6b0b92914345478ff250d5248 (patch)
treed4ead072c844a32a4c6ed6f721f47c484c3b5748 /file.c
parent5cffcf20b147ac88d58774ccce0b76db4704b329 (diff)
downloadwireshark-01a3873505e6f5c6b0b92914345478ff250d5248.tar.gz
Make file indices consistently unsigned in the merge code.
Change-Id: Ie531e5c24c32ca86abbe0c2b5d3526014e5fb831 Reviewed-on: https://code.wireshark.org/review/13897 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'file.c')
-rw-r--r--file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/file.c b/file.c
index de4b4c045b..4f493dc61c 100644
--- a/file.c
+++ b/file.c
@@ -1332,7 +1332,7 @@ cf_merge_files(char **out_filenamep, int in_file_count,
int out_fd;
int err = 0;
gchar *err_info = NULL;
- int err_fileno;
+ guint err_fileno;
merge_result status;
merge_progress_callback_t cb;