From cda6b8d582ec2d9e215cb0c0db6f92a951b4f583 Mon Sep 17 00:00:00 2001
From: David Wragg <david@wragg.org>
Date: Thu, 5 Mar 2015 13:56:21 +0000
Subject: [PATCH] Fix a few deviations from go fmt

---
 nameserver/server.go      | 4 ++--
 nameserver/server_test.go | 2 +-
 router/router.go          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nameserver/server.go b/nameserver/server.go
index 44e3102c..8b5bb7f7 100644
--- a/nameserver/server.go
+++ b/nameserver/server.go
@@ -52,8 +52,8 @@ type DNSServer struct {
 // Creates a new DNS server
 func NewDNSServer(config DNSServerConfig, zone Zone, iface *net.Interface) (s *DNSServer, err error) {
 	s = &DNSServer{
-		zone:   zone,
-		iface:  iface,
+		zone:  zone,
+		iface: iface,
 
 		Domain:     DEFAULT_LOCAL_DOMAIN,
 		IfaceName:  DEFAULT_IFACE_NAME,
diff --git a/nameserver/server_test.go b/nameserver/server_test.go
index 04069255..9fa9d302 100644
--- a/nameserver/server_test.go
+++ b/nameserver/server_test.go
@@ -41,7 +41,7 @@ func TestUDPDNSServer(t *testing.T) {
 				m.Answer = make([]dns.RR, 1)
 				m.Answer[0] = &dns.MX{Hdr: dns.RR_Header{Name: m.Question[0].Name, Rrtype: dns.TypeMX, Class: dns.ClassINET, Ttl: 0}, Mx: "mail." + nonLocalName}
 			} else if q.Name == nonLocalName && q.Qtype == dns.TypeANY {
-				m.Answer = make([]dns.RR, 512 / len("mailn."+nonLocalName) + 1)
+				m.Answer = make([]dns.RR, 512/len("mailn."+nonLocalName)+1)
 				for i, _ := range m.Answer {
 					m.Answer[i] = &dns.MX{Hdr: dns.RR_Header{Name: m.Question[0].Name, Rrtype: dns.TypeMX, Class: dns.ClassINET, Ttl: 0}, Mx: fmt.Sprintf("mail%d.%s", i, nonLocalName)}
 				}
diff --git a/router/router.go b/router/router.go
index fd867ee2..5fc5dc0b 100644
--- a/router/router.go
+++ b/router/router.go
@@ -94,7 +94,7 @@ func (router *Router) UsingPassword() bool {
 
 func (router *Router) Status() string {
 	var buf bytes.Buffer
-	buf.WriteString(fmt.Sprintln("Our name is", router.Ourself.Name, "(" + router.Ourself.NickName + ")"))
+	buf.WriteString(fmt.Sprintln("Our name is", router.Ourself.Name, "("+router.Ourself.NickName+")"))
 	buf.WriteString(fmt.Sprintln("Sniffing traffic on", router.Iface))
 	buf.WriteString(fmt.Sprintf("MACs:\n%s", router.Macs))
 	buf.WriteString(fmt.Sprintf("Peers:\n%s", router.Peers))