diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk/capture_file_dlg.c | 7 | ||||
| -rw-r--r-- | ui/gtk/drag_and_drop.c | 5 | ||||
| -rw-r--r-- | ui/qt/main_window.cpp | 7 |
3 files changed, 8 insertions, 11 deletions
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) { diff --git a/ui/gtk/drag_and_drop.c b/ui/gtk/drag_and_drop.c index 8f0d390c3e..4c34d29258 100644 --- a/ui/gtk/drag_and_drop.c +++ b/ui/gtk/drag_and_drop.c @@ -208,9 +208,8 @@ dnd_open_file_cmd(gchar *cf_names_freeme) } } else { /* merge the files in chronological order */ - tmpname = NULL; - if (cf_merge_files(&tmpname, in_file_count, in_filenames, - WTAP_FILE_TYPE_SUBTYPE_PCAPNG, FALSE) == CF_OK) { + if (cf_merge_files_to_tempfile(&tmpname, in_file_count, in_filenames, + WTAP_FILE_TYPE_SUBTYPE_PCAPNG, FALSE) == CF_OK) { /* Merge succeeded; close the currently-open file and try to open the merged capture file. */ cf_close(&cfile); diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index 8ed0f6a087..506907917d 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -1075,22 +1075,21 @@ void MainWindow::mergeCaptureFile() file_type = capture_file_.capFile()->cd_t; /* Try to merge or append the two files */ - tmpname = NULL; if (merge_dlg.mergeType() == 0) { /* chronological order */ in_filenames[0] = g_strdup(capture_file_.capFile()->filename); in_filenames[1] = qstring_strdup(file_name); - 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_dlg.mergeType() <= 0) { /* prepend file */ in_filenames[0] = qstring_strdup(file_name); in_filenames[1] = g_strdup(capture_file_.capFile()->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] = g_strdup(capture_file_.capFile()->filename); in_filenames[1] = qstring_strdup(file_name); - 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); } g_free(in_filenames[0]); |