From 78859c2960d66efd5478d12f5f86757ee3e423a9 Mon Sep 17 00:00:00 2001
From: Martin Polden <mpolden@mpolden.no>
Date: Sun, 29 Dec 2019 15:17:17 +0100
Subject: Rename m -> msg

---
 cache/cache.go    |  6 +++---
 dns/proxy_test.go | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/cache/cache.go b/cache/cache.go
index f3bb337..58205b4 100644
--- a/cache/cache.go
+++ b/cache/cache.go
@@ -180,9 +180,9 @@ func (c *Cache) isExpired(v *Value) bool {
 	return c.now().After(expiresAt)
 }
 
-func canCache(m *dns.Msg) bool {
-	if dnsutil.MinTTL(m) == 0 {
+func canCache(msg *dns.Msg) bool {
+	if dnsutil.MinTTL(msg) == 0 {
 		return false
 	}
-	return m.Rcode == dns.RcodeSuccess || m.Rcode == dns.RcodeNameError
+	return msg.Rcode == dns.RcodeSuccess || msg.Rcode == dns.RcodeNameError
 }
diff --git a/dns/proxy_test.go b/dns/proxy_test.go
index 85d41c9..c675f90 100644
--- a/dns/proxy_test.go
+++ b/dns/proxy_test.go
@@ -25,8 +25,8 @@ func (w *dnsWriter) TsigStatus() error           { return nil }
 func (w *dnsWriter) TsigTimersOnly(b bool)       {}
 func (w *dnsWriter) Hijack()                     {}
 
-func (w *dnsWriter) WriteMsg(m *dns.Msg) error {
-	w.lastReply = m
+func (w *dnsWriter) WriteMsg(msg *dns.Msg) error {
+	w.lastReply = msg
 	return nil
 }
 
@@ -37,7 +37,7 @@ type resolver struct {
 
 type testClient map[string]*resolver
 
-func (c testClient) Exchange(m *dns.Msg, addr string) (*dns.Msg, time.Duration, error) {
+func (c testClient) Exchange(msg *dns.Msg, addr string) (*dns.Msg, time.Duration, error) {
 	r, ok := c[addr]
 	if !ok {
 		panic("no such resolver: " + addr)
@@ -75,13 +75,13 @@ func testProxy(t *testing.T) *Proxy {
 	return proxy
 }
 
-func assertRR(t *testing.T, p *Proxy, m *dns.Msg, answer string) {
+func assertRR(t *testing.T, p *Proxy, msg *dns.Msg, answer string) {
 	var (
-		qtype = m.Question[0].Qtype
-		qname = m.Question[0].Name
+		qtype = msg.Question[0].Qtype
+		qname = msg.Question[0].Name
 	)
 	w := &dnsWriter{}
-	p.ServeDNS(w, m)
+	p.ServeDNS(w, msg)
 
 	qtypeString := dns.TypeToString[qtype]
 	answers := w.lastReply.Answer
@@ -90,8 +90,8 @@ func assertRR(t *testing.T, p *Proxy, m *dns.Msg, answer string) {
 	}
 	ans := answers[0]
 
-	if got := w.lastReply.Id; got != m.Id {
-		t.Errorf("id = %d, want %d for %s %s", got, m.Id, qtypeString, qname)
+	if got := w.lastReply.Id; got != msg.Id {
+		t.Errorf("id = %d, want %d for %s %s", got, msg.Id, qtypeString, qname)
 	}
 
 	want := net.ParseIP(answer)
-- 
cgit v1.2.3