From a5cee04fad8ca23a2f3a3ac5b5233ca6b01fe71e Mon Sep 17 00:00:00 2001 From: Jeff Morriss Date: Thu, 22 May 2008 15:46:27 +0000 Subject: Move the file utility functions from wiretap to libwsutil so that libwireshark (and the plugins using those functions) do not depend on wiretap on Windows. While doing that, rename the eth_* functions to ws_*. svn path=/trunk/; revision=25354 --- mergecap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mergecap.c') diff --git a/mergecap.c b/mergecap.c index 9099f39ba8..5b0aa95235 100644 --- a/mergecap.c +++ b/mergecap.c @@ -33,7 +33,7 @@ #include "svnversion.h" #include "merge.h" -#include "file_util.h" +#include "wsutil/file_util.h" #ifdef HAVE_FCNTL_H #include @@ -308,19 +308,19 @@ main(int argc, char *argv[]) } /* open the outfile */ - if (strncmp(out_filename, "-", 2) == 0) { + if (strncmp(out_filename, "-", 2) == 0) { /* use stdout as the outfile */ out_fd = 1 /*stdout*/; } else { /* open the outfile */ - out_fd = eth_open(out_filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0644); + out_fd = ws_open(out_filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0644); if (out_fd == -1) { fprintf(stderr, "mergecap: Couldn't open output file %s: %s\n", out_filename, strerror(errno)); exit(1); } - } - + } + /* prepare the outfile */ pdh = wtap_dump_fdopen(out_fd, file_type, frame_type, snaplen, FALSE /* compressed */, &open_err); if (pdh == NULL) { -- cgit v1.2.1