Get rid of merge_n_files() - it's only called in one place now, and

absorbing its logic into "cf_merge_files()" simplifies things a bit.

svn path=/trunk/; revision=12421

1 files changed, 2 insertions, 2 deletions

diff --git a/file.h b/file.h
index 967eeb8aaa..f3ab319bca 100644
--- a/file.h
+++ b/file.h
@@ -54,8 +54,8 @@ gboolean cf_save(char *fname, capture_file * cf, packet_range_t *range, guint sa
 gchar *cf_get_display_name(capture_file *);
 
 gboolean
-cf_merge_files(const char *out_file, int out_fd, int in_file_count,
-               char *const *in_filenames, int filetype, gboolean do_append);
+cf_merge_files(const char *out_filename, int out_fd, int in_file_count,
+               char *const *in_filenames, int file_type, gboolean do_append);
 
 gboolean filter_packets(capture_file *cf, gchar *dfilter, gboolean force);
 void reftime_packets(capture_file *);