From 4d1cd67d4d0d13b8078aca4ab65cc69f962de1a3 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Wed, 3 Apr 2024 16:49:37 +0200 Subject: [PATCH] Nits --- dnscrypt-proxy/coldstart.go | 3 +-- dnscrypt-proxy/plugin_dns64.go | 2 +- dnscrypt-proxy/sources_test.go | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dnscrypt-proxy/coldstart.go b/dnscrypt-proxy/coldstart.go index 98482dc8..81bccb7b 100644 --- a/dnscrypt-proxy/coldstart.go +++ b/dnscrypt-proxy/coldstart.go @@ -117,7 +117,6 @@ func handleColdStartClient(clientPc *net.UDPConn, cancelChannel chan struct{}, i } func addColdStartListener( - proxy *Proxy, ipsMap *CaptivePortalMap, listenAddrStr string, captivePortalHandler *CaptivePortalHandler, @@ -191,7 +190,7 @@ func ColdStart(proxy *Proxy) (*CaptivePortalHandler, error) { } ok := false for _, listenAddrStr := range listenAddrStrs { - err = addColdStartListener(proxy, &ipsMap, listenAddrStr, &captivePortalHandler) + err = addColdStartListener(&ipsMap, listenAddrStr, &captivePortalHandler) if err == nil { ok = true } diff --git a/dnscrypt-proxy/plugin_dns64.go b/dnscrypt-proxy/plugin_dns64.go index 4a1a8736..7e1a06ce 100644 --- a/dnscrypt-proxy/plugin_dns64.go +++ b/dnscrypt-proxy/plugin_dns64.go @@ -105,7 +105,7 @@ func (plugin *PluginDNS64) Eval(pluginsState *PluginsState, msg *dns.Msg) error return err } - if err != nil || resp.Rcode != dns.RcodeSuccess { + if resp.Rcode != dns.RcodeSuccess { return nil } diff --git a/dnscrypt-proxy/sources_test.go b/dnscrypt-proxy/sources_test.go index 04a6eac7..725b4bd1 100644 --- a/dnscrypt-proxy/sources_test.go +++ b/dnscrypt-proxy/sources_test.go @@ -144,7 +144,7 @@ func loadTestSourceNames(t *testing.T, d *SourceTestData) { } } -func generateFixtureState(t *testing.T, d *SourceTestData, suffix, file string, state SourceTestState) { +func generateFixtureState(_ *testing.T, d *SourceTestData, suffix, file string, state SourceTestState) { if _, ok := d.fixtures[state]; !ok { d.fixtures[state] = map[string]SourceFixture{} } @@ -296,7 +296,7 @@ func prepSourceTestCache(t *testing.T, d *SourceTestData, e *SourceTestExpect, s } func prepSourceTestDownload( - t *testing.T, + _ *testing.T, d *SourceTestData, e *SourceTestExpect, source string,