diff options
author | Guy Harris <guy@alum.mit.edu> | 2016-02-10 17:48:46 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2016-02-11 01:49:49 +0000 |
commit | 01a3873505e6f5c6b0b92914345478ff250d5248 (patch) | |
tree | d4ead072c844a32a4c6ed6f721f47c484c3b5748 /file.c | |
parent | 5cffcf20b147ac88d58774ccce0b76db4704b329 (diff) | |
download | wireshark-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.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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; |