summaryrefslogtreecommitdiff
path: root/filters.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 /filters.c
parentcfd03173b443f9c8644aa7196105f7eb166926a7 (diff)
downloadwireshark-c2ced4a2aba6bdde3fdad77407cd528e8a11a446.tar.gz
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 'filters.c')
-rw-r--r--filters.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/filters.c b/filters.c
index 8ec3bdcd75..5fb5ac4991 100644
--- a/filters.c
+++ b/filters.c
@@ -143,7 +143,7 @@ read_filter_list(filter_list_type_t list_type, char **pref_path_return,
}
/* try to open personal "cfilters"/"dfilters" file */
- ff_path = get_persconffile_path(ff_name, TRUE, FALSE);
+ ff_path = get_persconffile_path(ff_name, TRUE);
if ((ff = ws_fopen(ff_path, "r")) == NULL) {
/*
* Did that fail because the file didn't exist?
@@ -166,7 +166,7 @@ read_filter_list(filter_list_type_t list_type, char **pref_path_return,
* a particular list.
*/
g_free(ff_path);
- ff_path = get_persconffile_path(FILTER_FILE_NAME, FALSE, FALSE);
+ ff_path = get_persconffile_path(FILTER_FILE_NAME, FALSE);
if ((ff = ws_fopen(ff_path, "r")) == NULL) {
/*
* Did that fail because the file didn't exist?
@@ -488,7 +488,7 @@ save_filter_list(filter_list_type_t list_type, char **pref_path_return,
return;
}
- ff_path = get_persconffile_path(ff_name, TRUE, TRUE);
+ ff_path = get_persconffile_path(ff_name, TRUE);
/* Write to "XXX.new", and rename if that succeeds.
That means we don't trash the file if we fail to write it out