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/addr_resolv.c | |
| 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/addr_resolv.c')
| -rw-r--r-- | epan/addr_resolv.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index c75b6f0ea3..f27c73cd85 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -582,7 +582,7 @@ initialize_services(void) /* set personal services path */ if (g_pservices_path == NULL) - g_pservices_path = get_persconffile_path(ENAME_SERVICES, FALSE, FALSE); + g_pservices_path = get_persconffile_path(ENAME_SERVICES, FALSE); parse_services_file(g_pservices_path); @@ -1483,7 +1483,7 @@ initialize_ethers(void) * with it. It's used in get_ethbyname() and get_ethbyaddr() */ if (g_pethers_path == NULL) - g_pethers_path = get_persconffile_path(ENAME_ETHERS, FALSE, FALSE); + g_pethers_path = get_persconffile_path(ENAME_ETHERS, FALSE); /* manuf hash table initialization */ @@ -1893,7 +1893,7 @@ initialize_ipxnets(void) * with it. It's used in get_ipxnetbyname() and get_ipxnetbyaddr() */ if (g_pipxnets_path == NULL) - g_pipxnets_path = get_persconffile_path(ENAME_IPXNETS, FALSE, FALSE); + g_pipxnets_path = get_persconffile_path(ENAME_IPXNETS, FALSE); ipxnet_resolution_initialized = TRUE; } /* initialize_ipxnets */ @@ -2369,7 +2369,7 @@ subnet_name_lookup_init(void) subnet_length_entries[i].mask = get_subnet_mask(length); } - subnetspath = get_persconffile_path(ENAME_SUBNETS, FALSE, FALSE); + subnetspath = get_persconffile_path(ENAME_SUBNETS, FALSE); if (!read_subnets_file(subnetspath) && errno != ENOENT) { report_open_failure(subnetspath, errno, FALSE); } @@ -2473,7 +2473,7 @@ host_name_lookup_init(void) { * Load the user's hosts file, if they have one. */ if(!gbl_resolv_flags.load_hosts_file_from_profile_only){ - hostspath = get_persconffile_path(ENAME_HOSTS, TRUE, FALSE); + hostspath = get_persconffile_path(ENAME_HOSTS, TRUE); if (!read_hosts_file(hostspath) && errno != ENOENT) { report_open_failure(hostspath, errno, FALSE); } |