From dd98856afce144eb19104a6f40c1abedc9069558 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sat, 3 Dec 2016 17:57:34 -0800 Subject: Have separate merge APIs for regular file/temporary file/standard output. This is similar to what we have for opening a dump file - one API that uses the file name as specified, one that creates a temporary file and provides the file name, and one that uses the standard output. All of those APIs handle closing the output file. Change-Id: I56beea7be347402773460b9148ab31a8f8bc51e1 Reviewed-on: https://code.wireshark.org/review/19059 Reviewed-by: Guy Harris --- ui/gtk/capture_file_dlg.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'ui/gtk/capture_file_dlg.c') diff --git a/ui/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c index 2c7e0cab52..56267d761e 100644 --- a/ui/gtk/capture_file_dlg.c +++ b/ui/gtk/capture_file_dlg.c @@ -912,22 +912,21 @@ file_merge_cmd(GtkWidget *w _U_) file_type = cfile.cd_t; /* Try to merge or append the two files */ - tmpname = NULL; if (merge_type == 0) { /* chronological order */ in_filenames[0] = cfile.filename; in_filenames[1] = file_name->str; - merge_status = cf_merge_files(&tmpname, 2, in_filenames, file_type, FALSE); + merge_status = cf_merge_files_to_tempfile(&tmpname, 2, in_filenames, file_type, FALSE); } else if (merge_type < 0) { /* prepend file */ in_filenames[0] = file_name->str; in_filenames[1] = cfile.filename; - merge_status = cf_merge_files(&tmpname, 2, in_filenames, file_type, TRUE); + merge_status = cf_merge_files_to_tempfile(&tmpname, 2, in_filenames, file_type, TRUE); } else { /* append file */ in_filenames[0] = cfile.filename; in_filenames[1] = file_name->str; - merge_status = cf_merge_files(&tmpname, 2, in_filenames, file_type, TRUE); + merge_status = cf_merge_files_to_tempfile(&tmpname, 2, in_filenames, file_type, TRUE); } if (merge_status != CF_OK) { -- cgit v1.2.3