diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2004-06-21 16:45:07 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2004-06-21 16:45:07 +0000 |
| commit | 5c061e582e8ac9f0e744cb0981f942197a925613 (patch) | |
| tree | 1217e77a29ba40b20811eef4de8c737b5e82f50a /merge.c | |
| parent | c10d97d8e351193db5af5c9f2a79faae03a48a6a (diff) | |
if more than one file is (drag and) dropped into the program,
merge them together into a new temporary file
(and notice the user by a simple_dialog about it)
svn path=/trunk/; revision=11205
Diffstat (limited to 'merge.c')
| -rw-r--r-- | merge.c | 14 |
1 files changed, 2 insertions, 12 deletions
@@ -1,6 +1,6 @@ /* Combine two dump files, either by appending or by merging by timestamp * - * $Id: merge.c,v 1.4 2004/06/18 12:04:49 jmayer Exp $ + * $Id: merge.c,v 1.5 2004/06/21 16:45:06 ulfl Exp $ * * Written by Scott Renfro <scott@renfro.org> based on * editcap by Richard Sharpe and Guy Harris @@ -379,12 +379,10 @@ 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_two_files(char *out_filename, char *in_file0, char *in_file1, gboolean do_append, int *err) +merge_n_files(char *out_filename, int in_file_count, char **in_filenames, gboolean do_append, int *err) { extern char *optarg; extern int optind; - int in_file_count = 0; - char *in_filenames[2]; merge_in_file_t *in_files = NULL; merge_out_file_t out_file; gboolean ret; @@ -397,14 +395,6 @@ merge_two_files(char *out_filename, char *in_file0, char *in_file1, gboolean do_ out_file.snaplen = 0; /* no limit */ out_file.count = 1; /* frames output */ - /* check for proper args; at a minimum, must have an output - * filename and one input file - */ - in_file_count = 2; - - in_filenames[0] = in_file0; - in_filenames[1] = in_file1; - /* open the input files */ in_file_count = merge_open_in_files(in_file_count, in_filenames, &in_files, err); if (in_file_count < 2) { |