aboutsummaryrefslogtreecommitdiffstats
path: root/epan/prefs.c
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2013-04-09 02:48:03 +0000
committerJeff Morriss <jeff.morriss.ws@gmail.com>2013-04-09 02:48:03 +0000
commitc2ced4a2aba6bdde3fdad77407cd528e8a11a446 (patch)
tree76fee7f6f6a7e18bbec88064f1f36de465c1f667 /epan/prefs.c
parentcfd03173b443f9c8644aa7196105f7eb166926a7 (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/prefs.c')
-rw-r--r--epan/prefs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/prefs.c b/epan/prefs.c
index 367dad0622..3cf09eeb0a 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -2936,7 +2936,7 @@ read_prefs(int *gpf_errno_return, int *gpf_read_errno_return,
}
/* Construct the pathname of the user's preferences file. */
- pf_path = get_persconffile_path(PF_NAME, TRUE, FALSE);
+ pf_path = get_persconffile_path(PF_NAME, TRUE);
/* Read the user's preferences file, if it exists. */
*pf_path_return = NULL;
@@ -4439,7 +4439,7 @@ write_prefs(char **pf_path_return)
*/
if (pf_path_return != NULL) {
- pf_path = get_persconffile_path(PF_NAME, TRUE, TRUE);
+ pf_path = get_persconffile_path(PF_NAME, TRUE);
if ((pf = ws_fopen(pf_path, "w")) == NULL) {
*pf_path_return = pf_path;
return errno;