diff options
author | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-05-22 15:46:27 +0000 |
---|---|---|
committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-05-22 15:46:27 +0000 |
commit | a5cee04fad8ca23a2f3a3ac5b5233ca6b01fe71e (patch) | |
tree | 65a7d5c702bf3392494b33ddd7ed43c94e491670 /rawshark.c | |
parent | da2f447a9bda3a05dd8e61b1c1f5dea4b5912f6b (diff) |
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
Diffstat (limited to 'rawshark.c')
-rw-r--r-- | rawshark.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rawshark.c b/rawshark.c index 7b23e847ac..358e4ed993 100644 --- a/rawshark.c +++ b/rawshark.c @@ -73,7 +73,7 @@ #include <epan/epan.h> #include <epan/filesystem.h> #include <epan/privileges.h> -#include <wiretap/file_util.h> +#include <wsutil/file_util.h> #include "globals.h" #include <epan/packet.h> @@ -268,7 +268,7 @@ raw_pipe_open(const char *pipe_name) #endif /* _WIN32 */ } else { #ifndef _WIN32 - if (eth_stat(pipe_name, &pipe_stat) < 0) { + if (ws_stat(pipe_name, &pipe_stat) < 0) { g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG, "The capture session could not be initiated " "due to error on pipe: %s", strerror(errno)); @@ -288,7 +288,7 @@ raw_pipe_open(const char *pipe_name) } return -1; } - rfd = eth_open(pipe_name, O_RDONLY | O_NONBLOCK, 0000 /* no creation so don't matter */); + rfd = ws_open(pipe_name, O_RDONLY | O_NONBLOCK, 0000 /* no creation so don't matter */); if (rfd == -1) { g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG, "The capture session could not be initiated " |