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 /epan/uat_load.l | |
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 'epan/uat_load.l')
-rw-r--r-- | epan/uat_load.l | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/uat_load.l b/epan/uat_load.l index 2df7df8aaa..b34ecc51f2 100644 --- a/epan/uat_load.l +++ b/epan/uat_load.l @@ -59,7 +59,7 @@ #include <epan/emem.h> #include "uat-int.h" #include "uat_load_lex.h" -#include <wiretap/file_util.h> +#include <wsutil/file_util.h> #ifdef _WIN32 /* disable Windows VC compiler warning "signed/unsigned mismatch" associated */ @@ -288,7 +288,7 @@ gboolean uat_load(uat_t* uat_in, char** err) { } - if (!(yyin = eth_fopen(fname,"r"))) { + if (!(yyin = ws_fopen(fname,"r"))) { *err = strerror(errno); g_free(fname); return FALSE; @@ -353,7 +353,7 @@ gboolean uat_load_str(uat_t* uat_in, char* entry, char** err) { /* * We want to stop processing when we get to the end of the input. - * (%option noyywrap is not used because if used then + * (%option noyywrap is not used because if used then * some flex versions (eg: 2.5.35) generate code which causes * warnings by the Windows VC compiler). */ |