diff options
author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-10-17 02:53:26 +0000 |
---|---|---|
committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-10-17 02:53:26 +0000 |
commit | 915bd4358e5c47acfad828b8161bf3ac35dc6581 (patch) | |
tree | 86117c057484b03bfa27d0d967c023c9c3a6fa14 /merge.c | |
parent | 7c9ff7604e23e3e426284fa8e5226c939c64b044 (diff) |
From Mark C. Brown: allow the file type for the merge operation to be
specified in the GUI.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12326 f5534014-38df-0310-8fa8-9805f1628bb7
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 */ |