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>

diff --git a/file.c b/file.c
index de4b4c045bd159e70efbf00ca8572225d28d5a14..4f493dc61c95edbbb67b5f04a46aba86baacbf77 100644 (file)
--- 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;
 

diff --git a/wiretap/merge.c b/wiretap/merge.c
index 06dc5db6178bab4c8f3e763f934fb0a5a3b71b6a..b4e1438b0e9adc65b39162698dd7f3c3417566d3 100644 (file)
--- a/wiretap/merge.c
+++ b/wiretap/merge.c
@@ -119,12 +119,12 @@ add_idb_index_map(merge_in_file_t *in_file, const guint orig_index, const guint
  * @return TRUE if all files could be opened, FALSE otherwise
  */
 static gboolean
-merge_open_in_files(int in_file_count, const char *const *in_file_names,
+merge_open_in_files(guint in_file_count, const char *const *in_file_names,
                     merge_in_file_t **in_files, int *err, gchar **err_info,
-                    int *err_fileno)
+                    guint *err_fileno)
 {
-    gint i;
-    gint j;
+    guint i;
+    guint j;
     size_t files_size = in_file_count * sizeof(merge_in_file_t);
     merge_in_file_t *files;
     gint64 size;
@@ -148,7 +148,7 @@ merge_open_in_files(int in_file_count, const char *const *in_file_names,
         }
         size = wtap_file_size(files[i].wth, err);
         if (size == -1) {
-            for (j = 0; j != G_MAXINT && j <= i; j++)
+            for (j = 0; j != G_MAXUINT && j <= i; j++)
                 cleanup_in_file(&files[j]);
             *err_fileno = i;
             return FALSE;
@@ -842,7 +842,7 @@ merge_files(int out_fd, const gchar* out_filename, const int file_type,
             const char *const *in_filenames, const guint in_file_count,
             const gboolean do_append, const idb_merge_mode mode,
             guint snaplen, const gchar *app_name, merge_progress_callback_t* cb,
-            int *err, gchar **err_info, int *err_fileno)
+            int *err, gchar **err_info, guint *err_fileno)
 {
     merge_in_file_t    *in_files = NULL, *in_file = NULL;
     int                 frame_type = WTAP_ENCAP_PER_PACKET;

diff --git a/wiretap/merge.h b/wiretap/merge.h
index 9c36dc4fc7276ac0d0d423c498c49783a5654f0c..4fa08828684966d9a82008abada441400cdf5406 100644 (file)
--- a/wiretap/merge.h
+++ b/wiretap/merge.h
@@ -144,7 +144,7 @@ merge_files(int out_fd, const gchar* out_filename, const int file_type,
             const char *const *in_filenames, const guint in_file_count,
             const gboolean do_append, const idb_merge_mode mode,
             guint snaplen, const gchar *app_name, merge_progress_callback_t* cb,
-            int *err, gchar **err_info, int *err_fileno);
+            int *err, gchar **err_info, guint *err_fileno);
 
 #ifdef __cplusplus
 }