aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/file_wrappers.c
diff options
context:
space:
mode:
authormorriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7>2008-05-22 15:46:27 +0000
committermorriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7>2008-05-22 15:46:27 +0000
commit440ebe03d7ad360327a5752cd79879956f6aea8d (patch)
tree65a7d5c702bf3392494b33ddd7ed43c94e491670 /wiretap/file_wrappers.c
parent04d3d6b976e89f301cb6b79c3fd81d823d6a32c7 (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_*. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25354 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'wiretap/file_wrappers.c')
-rw-r--r--wiretap/file_wrappers.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/file_wrappers.c b/wiretap/file_wrappers.c
index 99bcc57d62..9692251624 100644
--- a/wiretap/file_wrappers.c
+++ b/wiretap/file_wrappers.c
@@ -113,7 +113,7 @@
#endif /* HAVE_LIBZ */
#include "wtap-int.h"
#include "file_wrappers.h"
-#include "file_util.h"
+#include <wsutil/file_util.h>
#ifdef HAVE_LIBZ
@@ -149,13 +149,13 @@ file_open(const char *path, const char *mode)
oflag |= O_BINARY;
#endif
/* open file and do correct filename conversions */
- if ((fd = eth_open(path, oflag, 0666)) == -1)
+ if ((fd = ws_open(path, oflag, 0666)) == -1)
return NULL;
/* open zlib file handle */
ft = gzdopen(fd, mode);
if (ft == NULL) {
- eth_close(fd);
+ ws_close(fd);
return NULL;
}