net/dns/dns_config_service_posix.cc - Issue 7839018: Fix usage error for libresolv - res_ninit on OSX requires res_ndestroy to close

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/dns/dns_config_service_posix.cc

Issue 7839018: Fix usage error for libresolv - res_ninit on OSX requires res_ndestroy to close (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Resolve merge conflict Created 9 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: net/dns/dns_config_service_posix.cc

diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc

index c8b4ab1105b6a338c667092305187723aedb6721..b05b164611dfdc4d6f206aaedd09e62d3f971853 100644

--- a/net/dns/dns_config_service_posix.cc

+++ b/net/dns/dns_config_service_posix.cc

@@ -35,7 +35,11 @@ class DnsConfigServicePosix::DnsConfigReader : public WatchingFileReader {

// Note: res_ninit in glibc always returns 0 and sets RES_INIT.

success_ = false;

}

+#if defined(OS_MACOSX)

+ res_ndestroy(&res);

+#else

res_nclose(&res);

+#endif

}

void OnReadFinished() OVERRIDE {

« no previous file with comments | « no previous file | tools/valgrind/memcheck/suppressions_mac.txt » ('j') | no next file with comments »