diff options
Diffstat (limited to 'epan/prefs.c')
| -rw-r--r-- | epan/prefs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/prefs.c b/epan/prefs.c index b6a641af5d..918a0797d4 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -46,7 +46,7 @@ #include "cfile.h" #include <epan/column.h> #include "print.h" -#include <wiretap/file_util.h> +#include <wsutil/file_util.h> #include <epan/prefs-int.h> #include <epan/uat-int.h> @@ -1263,19 +1263,19 @@ read_prefs(int *gpf_errno_return, int *gpf_read_errno_return, * file doesn't exist, try the old path. */ gpf_path = get_datafile_path(PF_NAME); - if ((pf = eth_fopen(gpf_path, "r")) == NULL && errno == ENOENT) { + if ((pf = ws_fopen(gpf_path, "r")) == NULL && errno == ENOENT) { /* * It doesn't exist by the new name; try the old name. */ g_free(gpf_path); gpf_path = get_datafile_path(OLD_GPF_NAME); - pf = eth_fopen(gpf_path, "r"); + pf = ws_fopen(gpf_path, "r"); } } else { /* * We have the path; try it. */ - pf = eth_fopen(gpf_path, "r"); + pf = ws_fopen(gpf_path, "r"); } /* @@ -1318,7 +1318,7 @@ read_prefs(int *gpf_errno_return, int *gpf_read_errno_return, /* Read the user's preferences file, if it exists. */ *pf_path_return = NULL; - if ((pf = eth_fopen(pf_path, "r")) != NULL) { + if ((pf = ws_fopen(pf_path, "r")) != NULL) { /* * Start out the counters of "mgcp.{tcp,udp}.port" entries we've * seen. @@ -2562,7 +2562,7 @@ write_prefs(char **pf_path_return) if (pf_path_return != NULL) { pf_path = get_persconffile_path(PF_NAME, TRUE, TRUE); - if ((pf = eth_fopen(pf_path, "w")) == NULL) { + if ((pf = ws_fopen(pf_path, "w")) == NULL) { *pf_path_return = pf_path; return errno; } |