From 01a3873505e6f5c6b0b92914345478ff250d5248 Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Wed, 10 Feb 2016 17:48:46 -0800
Subject: 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>
---
 file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'file.c')

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;
 
-- 
cgit v1.2.3