aboutsummaryrefslogtreecommitdiffstats
path: root/file.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2016-05-29 13:52:19 -0400
committerMartin Mathieson <martin.r.mathieson@googlemail.com>2016-06-01 06:24:05 +0000
commitacc018b8d1db3489d3f63f8f096c593243191469 (patch)
treee7adc7f2ffe56a94550c7def88de4cc8f50d9ac8 /file.c
parentb2845a6ac885d49aa1ea5d3865cd377d812eb4c7 (diff)
Allow create_tempfile to support a suffix.
Ping-Bug: 10203 Change-Id: Ifa24870d711449b87e9839dd46af614e4aa28fde Reviewed-on: https://code.wireshark.org/review/15608 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Diffstat (limited to 'file.c')
-rw-r--r--file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/file.c b/file.c
index 75a11d4540..b799e21dab 100644
--- a/file.c
+++ b/file.c
@@ -1345,7 +1345,7 @@ cf_merge_files(char **out_filenamep, int in_file_count,
if (out_fd == -1)
err = errno;
} else {
- out_fd = create_tempfile(&tmpname, "wireshark");
+ out_fd = create_tempfile(&tmpname, "wireshark", NULL);
if (out_fd == -1)
err = errno;
out_filename = g_strdup(tmpname);