diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-12-03 17:57:34 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-12-04 03:12:23 +0000 |
| commit | dd98856afce144eb19104a6f40c1abedc9069558 (patch) | |
| tree | 2136bbdee3544f4324bf214a78aff65da350682c /ui/gtk/drag_and_drop.c | |
| parent | 5aede1bc50b6bb9ae13926e2249d22d95c12814e (diff) | |
| download | wireshark-dd98856afce144eb19104a6f40c1abedc9069558.tar.gz | |
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 <guy@alum.mit.edu>
Diffstat (limited to 'ui/gtk/drag_and_drop.c')
| -rw-r--r-- | ui/gtk/drag_and_drop.c | 5 |
1 files changed, 2 insertions, 3 deletions
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); |