diff options
| author | Michael Tüxen <tuexen@fh-muenster.de> | 2012-04-25 18:38:55 +0000 |
|---|---|---|
| committer | Michael Tüxen <tuexen@fh-muenster.de> | 2012-04-25 18:38:55 +0000 |
| commit | b6ed0f345a0de723d80daed7a32ec149379780d7 (patch) | |
| tree | e7cdc6fa5c18ac95a48a61ace3b5081a0e871dd1 /mergecap.c | |
| parent | d2526de5f8e0bdf42d263d522a44a37f0deb9ca6 (diff) | |
| download | wireshark-b6ed0f345a0de723d80daed7a32ec149379780d7.tar.gz wireshark-b6ed0f345a0de723d80daed7a32ec149379780d7.tar.bz2 wireshark-b6ed0f345a0de723d80daed7a32ec149379780d7.zip | |
Fix compilation. While there, remove some trailing whitespaces.
svn path=/trunk/; revision=42237
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mergecap.c b/mergecap.c index 502577a09b..c17ab9622f 100644 --- a/mergecap.c +++ b/mergecap.c @@ -396,7 +396,7 @@ main(int argc, char *argv[]) comment_gstr = g_string_new("File created my merging: \n"); for (i = 0; i < in_file_count; i++) { - g_string_append_printf(comment_gstr, "File%u: %s \n",i+1,in_files->filename[i]); + g_string_append_printf(comment_gstr, "File%d: %s \n",i+1,in_files[0].filename); } shb_hdr->section_length = -1; /* options */ @@ -405,7 +405,7 @@ main(int argc, char *argv[]) shb_hdr->shb_os = NULL; /* NULL if not available, UTF-8 string containing the name of the operating system used to create this section. */ shb_hdr->shb_user_appl = "mergecap"; /* NULL if not available, UTF-8 string containing the name of the application used to create this section. */ - pdh = wtap_dump_fdopen_ng(out_fd, file_type, frame_type, snaplen, + pdh = wtap_dump_fdopen_ng(out_fd, file_type, frame_type, snaplen, FALSE /* compressed */, shb_hdr, NULL /* wtapng_iface_descriptions_t *idb_inf */, &open_err); g_string_free(comment_gstr, TRUE); }else{ |