From 7a4a88aeb9f5ef77442adf41f42169a088f78015 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Thu, 26 Mar 2015 18:04:57 +0000
Subject: [PATCH] Remove unused unnamed second item in ranges

---
 nameserver/server_test.go  | 2 +-
 router/connection_maker.go | 2 +-
 router/peers.go            | 4 ++--
 router/router.go           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nameserver/server_test.go b/nameserver/server_test.go
index 2ca71edd..d55f891c 100644
--- a/nameserver/server_test.go
+++ b/nameserver/server_test.go
@@ -51,7 +51,7 @@ func TestUDPDNSServer(t *testing.T) {
 				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)
-				for i, _ := range m.Answer {
+				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)}
 				}
 			} else if q.Name == testRDNSnonlocal && q.Qtype == dns.TypePTR {
diff --git a/router/connection_maker.go b/router/connection_maker.go
index f1f551a8..485177a2 100644
--- a/router/connection_maker.go
+++ b/router/connection_maker.go
@@ -119,7 +119,7 @@ func (cm *ConnectionMaker) checkStateAndAttemptConnections() time.Duration {
 	}
 
 	// Add command-line targets that are not connected
-	for address, _ := range cm.cmdLineAddress {
+	for address := range cm.cmdLineAddress {
 		addTarget(address)
 	}
 
diff --git a/router/peers.go b/router/peers.go
index db1f5e41..4f3090b6 100644
--- a/router/peers.go
+++ b/router/peers.go
@@ -107,7 +107,7 @@ func (peers *Peers) Names() PeerNameSet {
 func (peers *Peers) EncodePeers(names PeerNameSet) []byte {
 	peers.RLock()
 	peerList := make([]*Peer, 0, len(names))
-	for name, _ := range names {
+	for name := range names {
 		if peer, found := peers.table[name]; found {
 			peerList = append(peerList, peer)
 		}
@@ -169,7 +169,7 @@ func (peers *Peers) garbageCollect() []*Peer {
 
 func setFromPeersMap(peers map[PeerName]*Peer) PeerNameSet {
 	names := make(PeerNameSet)
-	for name, _ := range peers {
+	for name := range peers {
 		names[name] = true
 	}
 	return names
diff --git a/router/router.go b/router/router.go
index e901ec34..b79871df 100644
--- a/router/router.go
+++ b/router/router.go
@@ -377,7 +377,7 @@ func NewTopologyGossipData(peers *Peers, update ...*Peer) *TopologyGossipData {
 }
 
 func (d *TopologyGossipData) Merge(other GossipData) {
-	for name, _ := range other.(*TopologyGossipData).update {
+	for name := range other.(*TopologyGossipData).update {
 		d.update[name] = true
 	}
 }