Change some of the merge.c APIs to return more information on failure,

and use that information to provide better error messages.

Have "merge_open_outfile()" do all the work of filling in the
merge_out_file_t structure, with the values to use passed as arguments. 
Get rid of some structure members that used to be used solely to pass
information to "merge_open_outfile()".

Add a "cf_merge_files()" routine to do the merging and reporting of errors.

svn path=/trunk/; revision=12420

1 files changed, 4 insertions, 0 deletions

diff --git a/file.h b/file.h
index b72c9d09ba..967eeb8aaa 100644
--- a/file.h
+++ b/file.h
@@ -53,6 +53,10 @@ read_status_t cf_finish_tail(capture_file *, int *);
 gboolean cf_save(char *fname, capture_file * cf, packet_range_t *range, guint save_format);
 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);
+
 gboolean filter_packets(capture_file *cf, gchar *dfilter, gboolean force);
 void reftime_packets(capture_file *);
 void colorize_packets(capture_file *);