From b43a3e9ab2d355cda83da95322fa4ed5a64af48e Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Mon, 11 May 2015 02:37:59 +0100 Subject: [PATCH] cosmetic: resolve some more linter complaints --- nameserver/mdns_client.go | 2 +- nameserver/mdns_lookup.go | 2 +- nameserver/mdns_server_test.go | 2 +- nameserver/mocks_test.go | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nameserver/mdns_client.go b/nameserver/mdns_client.go index df814426..4163e342 100644 --- a/nameserver/mdns_client.go +++ b/nameserver/mdns_client.go @@ -214,7 +214,7 @@ func (c *MDNSClient) ResponseCallback(r *dns.Msg) { } if query, found := c.inflight[name]; found { - newResponseInfos := make([]*responseInfo, 0) + var newResponseInfos []*responseInfo for _, resp := range query.responseInfos { resp.ch <- res // insistent queries are not removed on the first reply, but on the timeout diff --git a/nameserver/mdns_lookup.go b/nameserver/mdns_lookup.go index 268d09cb..05619367 100644 --- a/nameserver/mdns_lookup.go +++ b/nameserver/mdns_lookup.go @@ -6,7 +6,7 @@ import ( ) func mdnsLookup(client *MDNSClient, name string, qtype uint16, insistent bool) ([]ZoneRecord, error) { - responses := make([]*Response, 0) + var responses []*Response channel := make(chan *Response) client.SendQuery(name, qtype, insistent, channel) diff --git a/nameserver/mdns_server_test.go b/nameserver/mdns_server_test.go index 9a962c6f..6a45a511 100644 --- a/nameserver/mdns_server_test.go +++ b/nameserver/mdns_server_test.go @@ -26,7 +26,7 @@ func TestServerSimpleQuery(t *testing.T) { wt.AssertNoErr(t, err) defer mdnsServer.Stop() - receivedAddrs := make([]net.IP, 0) + var receivedAddrs []net.IP receivedName := "" recvChan := make(chan interface{}) receivedCount := 0 diff --git a/nameserver/mocks_test.go b/nameserver/mocks_test.go index a566ac8f..5f3ba870 100644 --- a/nameserver/mocks_test.go +++ b/nameserver/mocks_test.go @@ -35,7 +35,7 @@ func (mz *mockedZoneWithRecords) LookupName(name string) ([]ZoneRecord, error) { defer mz.Unlock() mz.NumLookupsName++ - res := make([]ZoneRecord, 0) + var res []ZoneRecord for _, r := range mz.records { if r.Name() == name { res = append(res, r) @@ -50,7 +50,7 @@ func (mz *mockedZoneWithRecords) LookupInaddr(inaddr string) ([]ZoneRecord, erro defer mz.Unlock() mz.NumLookupsInaddr++ - res := make([]ZoneRecord, 0) + var res []ZoneRecord for _, r := range mz.records { revIP, err := raddrToIP(inaddr) if err != nil {