TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

cleanup: remove redundant return statement (#3297)

Browse source 
Signed-off-by: Guangming Wang <guangming.wang@daocloud.io>
This commit is contained in:
Guangming Wang 2019-09-23 21:40:14 +08:00 • committed by Miek Gieben
parent 004c5fca9d
commit 081e45afa3
15 changed files with 10 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

1
core/dnsserver/server.go
View file

@ -302,7 +302,6 @@ func (s *Server) OnStartupComplete() {
if out != "" {
fmt.Print(out)
}
return
}
// Tracer returns the tracer in the server if defined.

5
core/dnsserver/server_grpc.go
View file

@ -93,7 +93,6 @@ func (s *ServergRPC) OnStartupComplete() {
if out != "" {
fmt.Print(out)
}
return
}
// Stop stops the server. It blocks until the server is
@ -165,8 +164,8 @@ func (r *gRPCresponse) Write(b []byte) (int, error) {
// These methods implement the dns.ResponseWriter interface from Go DNS.
func (r *gRPCresponse) Close() error { return nil }
func (r *gRPCresponse) TsigStatus() error { return nil }
func (r *gRPCresponse) TsigTimersOnly(b bool) { return }
func (r *gRPCresponse) Hijack() { return }
func (r *gRPCresponse) TsigTimersOnly(b bool) {}
func (r *gRPCresponse) Hijack() {}
func (r *gRPCresponse) LocalAddr() net.Addr { return r.localAddr }
func (r *gRPCresponse) RemoteAddr() net.Addr { return r.remoteAddr }
func (r *gRPCresponse) WriteMsg(m *dns.Msg) error { r.Msg = m; return nil }

1
core/dnsserver/server_https.go
View file

@ -82,7 +82,6 @@ func (s *ServerHTTPS) OnStartupComplete() {
if out != "" {
fmt.Print(out)
}
return
}
// Stop stops the server. It blocks until the server is totally stopped.

1
core/dnsserver/server_tls.go
View file

@ -78,5 +78,4 @@ func (s *ServerTLS) OnStartupComplete() {
if out != "" {
fmt.Print(out)
}
return
}

1
plugin/erratic/xfr.go
View file

@ -48,5 +48,4 @@ func xfr(state request.Request, truncate bool) {
tr.Out(state.W, state.Req, ch)
state.W.Hijack()
return
}

1
plugin/file/tree/tree.go
View file

@ -290,7 +290,6 @@ func (t *Tree) Delete(rr dns.RR) {
if el.Empty() {
t.deleteNode(rr)
}
return
}
// DeleteNode deletes the node that matches rr according to Less().

1
plugin/health/health.go
View file

@ -43,7 +43,6 @@ func (h *health) OnStartup() error {
// We're always healthy.
w.WriteHeader(http.StatusOK)
io.WriteString(w, http.StatusText(http.StatusOK))
return
})
go func() { http.Serve(h.ln, h.mux) }()

2
plugin/k8s_external/external_test.go
View file

@ -152,7 +152,7 @@ var tests = []test.Case{
type external struct{}
func (external) HasSynced() bool { return true }
func (external) Run() { return }
func (external) Run() {}
func (external) Stop() error { return nil }
func (external) EpIndexReverse(string) []*object.Endpoints { return nil }
func (external) SvcIndexReverse(string) []*object.Service { return nil }

2
plugin/kubernetes/external_test.go
View file

@ -79,7 +79,7 @@ func TestExternal(t *testing.T) {
type external struct{}
func (external) HasSynced() bool { return true }
func (external) Run() { return }
func (external) Run() {}
func (external) Stop() error { return nil }
func (external) EpIndexReverse(string) []*object.Endpoints { return nil }
func (external) SvcIndexReverse(string) []*object.Service { return nil }

2
plugin/kubernetes/handler_test.go
View file

@ -521,7 +521,7 @@ type APIConnServeTest struct {
}
func (a APIConnServeTest) HasSynced() bool { return !a.notSynced }
func (APIConnServeTest) Run() { return }
func (APIConnServeTest) Run() {}
func (APIConnServeTest) Stop() error { return nil }
func (APIConnServeTest) EpIndexReverse(string) []*object.Endpoints { return nil }
func (APIConnServeTest) SvcIndexReverse(string) []*object.Service { return nil }

2
plugin/kubernetes/kubernetes_test.go
View file

@ -61,7 +61,7 @@ func TestEndpointHostname(t *testing.T) {
type APIConnServiceTest struct{}
func (APIConnServiceTest) HasSynced() bool { return true }
func (APIConnServiceTest) Run() { return }
func (APIConnServiceTest) Run() {}
func (APIConnServiceTest) Stop() error { return nil }
func (APIConnServiceTest) PodIndex(string) []*object.Pod { return nil }
func (APIConnServiceTest) SvcIndexReverse(string) []*object.Service { return nil }

2
plugin/kubernetes/ns_test.go
View file

@ -13,7 +13,7 @@ import (
type APIConnTest struct{}
func (APIConnTest) HasSynced() bool { return true }
func (APIConnTest) Run() { return }
func (APIConnTest) Run() {}
func (APIConnTest) Stop() error { return nil }
func (APIConnTest) PodIndex(string) []*object.Pod { return nil }
func (APIConnTest) SvcIndexReverse(string) []*object.Service { return nil }

2
plugin/kubernetes/reverse_test.go
View file

@ -16,7 +16,7 @@ import (
type APIConnReverseTest struct{}
func (APIConnReverseTest) HasSynced() bool { return true }
func (APIConnReverseTest) Run() { return }
func (APIConnReverseTest) Run() {}
func (APIConnReverseTest) Stop() error { return nil }
func (APIConnReverseTest) PodIndex(string) []*object.Pod { return nil }
func (APIConnReverseTest) EpIndex(string) []*object.Endpoints { return nil }

1
plugin/kubernetes/xfr.go
View file

@ -184,7 +184,6 @@ func (k *Kubernetes) transfer(c chan dns.RR, zone string) {
}
}
}
return
}
// emitAddressRecord generates a new A or AAAA record based on the msg.Service and writes it to

4
plugin/test/responsewriter.go
View file

@ -51,10 +51,10 @@ func (t *ResponseWriter) Close() error { return nil }
func (t *ResponseWriter) TsigStatus() error { return nil }
// TsigTimersOnly implement dns.ResponseWriter interface.
func (t *ResponseWriter) TsigTimersOnly(bool) { return }
func (t *ResponseWriter) TsigTimersOnly(bool) {}
// Hijack implement dns.ResponseWriter interface.
func (t *ResponseWriter) Hijack() { return }
func (t *ResponseWriter) Hijack() {}
// ResponseWriter6 returns fixed client and remote address in IPv6. The remote
// address is always fe80::42:ff:feca:4c65 and port 40212. The local address is always ::1 and port 53.