diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-10-17 02:53:26 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-10-17 02:53:26 +0000 |
| commit | 4624549a992d61ae1881b11aeae5a58de1240c45 (patch) | |
| tree | 86117c057484b03bfa27d0d967c023c9c3a6fa14 /merge.c | |
| parent | 236123a94bf8f7fc1e72bbe0b4fed35a3ffa9703 (diff) | |
From Mark C. Brown: allow the file type for the merge operation to be
specified in the GUI.
svn path=/trunk/; revision=12326
Diffstat (limited to 'merge.c')
| -rw-r--r-- | merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -375,7 +375,7 @@ merge_open_in_files(int in_file_count, char *in_file_names[], merge_in_file_t *i * Convenience function: merge two files into one. */ gboolean -merge_n_files(int out_fd, 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, int filetype, gboolean do_append, int *err) { extern char *optarg; extern int optind; @@ -386,7 +386,7 @@ merge_n_files(int out_fd, int in_file_count, char **in_filenames, gboolean do_ap /* initialize out_file */ out_file.fd = out_fd; out_file.pdh = NULL; /* wiretap dumpfile */ - out_file.file_type = WTAP_FILE_PCAP; /* default to "libpcap" */ + out_file.file_type = filetype; out_file.frame_type = -2; /* leave type alone */ out_file.snaplen = 0; /* no limit */ out_file.count = 1; /* frames output */ |