aboutsummaryrefslogtreecommitdiffstats
path: root/file.c
diff options
context:
space:
mode:
authorDavid Perry <boolean263@protonmail.com>2022-02-09 14:32:28 +0000
committerA Wireshark GitLab Utility <6629907-ws-gitlab-utility@users.noreply.gitlab.com>2022-02-09 14:32:28 +0000
commit1e0d117eb7ab1ce7f4ff8a4fd6dc2529634d7baa (patch)
treee7670b02e6c4d49e4f321864e730e0e48433b151 /file.c
parentf72787e86ff78790559fd5550e98865e225bfb68 (diff)
Specify directory for temporary captures
Diffstat (limited to 'file.c')
-rw-r--r--file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/file.c b/file.c
index 5f4df5ea89..b1c9160020 100644
--- a/file.c
+++ b/file.c
@@ -1400,7 +1400,7 @@ merge_callback(merge_event event, int num _U_,
cf_status_t
-cf_merge_files_to_tempfile(gpointer pd_window, char **out_filenamep,
+cf_merge_files_to_tempfile(gpointer pd_window, const char *temp_dir, char **out_filenamep,
int in_file_count, const char *const *in_filenames,
int file_type, gboolean do_append)
{
@@ -1420,7 +1420,7 @@ cf_merge_files_to_tempfile(gpointer pd_window, char **out_filenamep,
cf_callback_invoke(cf_cb_file_merge_started, NULL);
/* merge the files */
- status = merge_files_to_tempfile(out_filenamep, "wireshark", file_type,
+ status = merge_files_to_tempfile(temp_dir, out_filenamep, "wireshark", file_type,
in_filenames,
in_file_count, do_append,
IDB_MERGE_MODE_ALL_SAME, 0 /* snaplen */,