mirrors/dnscrypt-proxy
1
0
Fork 0
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git synced 2025-04-05 22:27:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Don't use named return values just for one value, especially an error

Browse source 
Be consistent with the rest of the code
This commit is contained in:
Frank Denis 2019-12-09 16:59:02 +01:00
parent 3e32d38f29
commit 2d8fd40481
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dnscrypt-proxy/xtransport.go
View file

@ -246,20 +246,20 @@ func (xTransport *XTransport) resolveUsingResolver(proto, host string, resolver
} }
// Return a cached entry, or resolve a name and update the cache // Return a cached entry, or resolve a name and update the cache
func (xTransport *XTransport) resolveWithCache(host string) (err error) { func (xTransport *XTransport) resolveWithCache(host string) error {
err = nil
if xTransport.proxyDialer != nil || xTransport.httpProxyFunction != nil { if xTransport.proxyDialer != nil || xTransport.httpProxyFunction != nil {
return return nil
} }
if ParseIP(host) != nil { if ParseIP(host) != nil {
return return nil
} }
cachedIP, expired := xTransport.loadCachedIP(host) cachedIP, expired := xTransport.loadCachedIP(host)
if cachedIP != nil && !expired { if cachedIP != nil && !expired {
return return nil
} }
var foundIP net.IP var foundIP net.IP
var ttl time.Duration var ttl time.Duration
var err error
if !xTransport.ignoreSystemDNS { if !xTransport.ignoreSystemDNS {
foundIP, ttl, err = xTransport.resolveUsingSystem(host) foundIP, ttl, err = xTransport.resolveUsingSystem(host)
} }
@ -292,12 +292,12 @@ func (xTransport *XTransport) resolveWithCache(host string) (err error) {
foundIP = cachedIP foundIP = cachedIP
ttl = ExpiredCachedIPGraceTTL ttl = ExpiredCachedIPGraceTTL
} else { } else {
return return err
} }
} }
xTransport.saveCachedIP(host, foundIP, ttl) xTransport.saveCachedIP(host, foundIP, ttl)
dlog.Debugf("[%s] IP address [%s] added to the cache, valid for %v", host, foundIP, ttl) dlog.Debugf("[%s] IP address [%s] added to the cache, valid for %v", host, foundIP, ttl)
return return nil
} }
func (xTransport *XTransport) Fetch(method string, url *url.URL, accept string, contentType string, body *[]byte, timeout time.Duration, padding *string) (*http.Response, time.Duration, error) { func (xTransport *XTransport) Fetch(method string, url *url.URL, accept string, contentType string, body *[]byte, timeout time.Duration, padding *string) (*http.Response, time.Duration, error) {