From 19c7f04794260e6bc54b837261673a4458cd99ee Mon Sep 17 00:00:00 2001 From: Ulf Lamping Date: Tue, 29 Jun 2004 20:59:24 +0000 Subject: avoid using tmpnam() for security reasons. instead of giving the merge stuff a filename, give it an already opened file descriptor svn path=/trunk/; revision=11273 --- merge.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'merge.h') diff --git a/merge.h b/merge.h index 736638053e..933333c146 100644 --- a/merge.h +++ b/merge.h @@ -2,7 +2,7 @@ * Definitions for menu routines with toolkit-independent APIs but * toolkit-dependent implementations. * - * $Id: merge.h,v 1.3 2004/06/21 16:45:06 ulfl Exp $ + * $Id: merge.h,v 1.4 2004/06/29 20:59:23 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -46,7 +46,7 @@ typedef struct merge_in_file_s { * Structures to manage our output file. */ typedef struct merge_out_file_s { - const char *filename; + int fd; wtap_dumper *pdh; int file_type; int frame_type; @@ -152,7 +152,7 @@ merge_append_files(int in_file_count, merge_in_file_t in_files[], merge_out_file * @return TRUE if function succeeded */ extern gboolean -merge_n_files(char *out_filename, int in_file_count, char **in_filenames, gboolean do_append, int *err); +merge_n_files(int out_fd, int in_file_count, char **in_filenames, gboolean do_append, int *err); #ifdef __cplusplus -- cgit v1.2.3