path: root/file.h
diff options
authorGuy Harris <guy@alum.mit.edu>2016-12-03 17:57:34 -0800
committerGuy Harris <guy@alum.mit.edu>2016-12-04 03:12:23 +0000
commitdd98856afce144eb19104a6f40c1abedc9069558 (patch)
tree2136bbdee3544f4324bf214a78aff65da350682c /file.h
parent5aede1bc50b6bb9ae13926e2249d22d95c12814e (diff)
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 'file.h')
1 files changed, 6 insertions, 6 deletions
diff --git a/file.h b/file.h
index 65354e7d47..025e5d1971 100644
--- a/file.h
+++ b/file.h
@@ -645,12 +645,11 @@ void cf_ignore_frame(capture_file *cf, frame_data *frame);
void cf_unignore_frame(capture_file *cf, frame_data *frame);
- * Merge two (or more) capture files into one.
+ * Merge two or more capture files into a temporary file.
* @todo is this the right place for this function? It doesn't have to do a lot with capture_file.
- * @param out_filename pointer to output filename; if output filename is
- * NULL, a temporary file name is generated and *out_filename is set
- * to point to the generated file name
+ * @param out_filenamep Points to a pointer that's set to point to the
+ * pathname of the temporary file; it's allocated with g_malloc()
* @param in_file_count the number of input files to merge
* @param in_filenames array of input filenames
* @param file_type the output filetype
@@ -658,8 +657,9 @@ void cf_unignore_frame(capture_file *cf, frame_data *frame);
* @return one of cf_status_t
-cf_merge_files(char **out_filename, int in_file_count,
- char *const *in_filenames, int file_type, gboolean do_append);
+cf_merge_files_to_tempfile(char **out_filenamep, int in_file_count,
+ char *const *in_filenames, int file_type,
+ gboolean do_append);