diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-04-09 02:48:03 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-04-09 02:48:03 +0000 |
| commit | c2ced4a2aba6bdde3fdad77407cd528e8a11a446 (patch) | |
| tree | 76fee7f6f6a7e18bbec88064f1f36de465c1f667 /epan/wslua | |
| parent | cfd03173b443f9c8644aa7196105f7eb166926a7 (diff) | |
Don't try to open <home>/.wireshark on Windows: Wireshark hasn't written to
that directory since 2001 and reading from that directory was only left in for
backwards compatibility with versions prior to r4702. I think it's now safe
to remove that backwards compatibility.
This eliminates the last argument of get_persconffile_path().
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8437
svn path=/trunk/; revision=48797
Diffstat (limited to 'epan/wslua')
| -rw-r--r-- | epan/wslua/init_wslua.c | 4 | ||||
| -rw-r--r-- | epan/wslua/wslua_util.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/epan/wslua/init_wslua.c b/epan/wslua/init_wslua.c index 286d91bfe5..ad23c1ecb0 100644 --- a/epan/wslua/init_wslua.c +++ b/epan/wslua/init_wslua.c @@ -337,7 +337,7 @@ int wslua_init(register_cb cb, gpointer client_data) { G_LOG_LEVEL_MESSAGE| G_LOG_LEVEL_INFO| G_LOG_LEVEL_DEBUG), - ops ? ops->logger : basic_logger, + ops ? ops->logger : basic_logger, NULL); if (!L) { @@ -396,7 +396,7 @@ int wslua_init(register_cb cb, gpointer client_data) { /* if we are indeed superuser run user scripts only if told to do so */ if ( (!started_with_special_privs()) || run_anyway ) { - filename = get_persconffile_path("init.lua", FALSE, FALSE); + filename = get_persconffile_path("init.lua", FALSE); if ((file_exists(filename))) { lua_load_script(filename); diff --git a/epan/wslua/wslua_util.c b/epan/wslua/wslua_util.c index 575277b5e7..073dea08b4 100644 --- a/epan/wslua/wslua_util.c +++ b/epan/wslua/wslua_util.c @@ -189,7 +189,7 @@ static char* wslua_get_actual_filename(const char* fname) { return g_strdup(fname_clean); } - filename = get_persconffile_path(fname_clean,FALSE,FALSE); + filename = get_persconffile_path(fname_clean,FALSE); if ( file_exists(filename) ) { return filename; @@ -252,7 +252,7 @@ WSLUA_FUNCTION wslua_dofile(lua_State* L) { WSLUA_FUNCTION wslua_persconffile_path(lua_State* L) { #define WSLUA_OPTARG_persconffile_path_FILENAME 1 /* A filename */ const char *fname = luaL_optstring(L, WSLUA_OPTARG_persconffile_path_FILENAME,""); - char* filename = get_persconffile_path(fname,FALSE,FALSE); + char* filename = get_persconffile_path(fname,FALSE); lua_pushstring(L,filename); g_free(filename); |