From 31f736b37ef269d5b534b3fe20e9d21c16d12726 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Tue, 26 Jan 2016 18:13:29 +0000
Subject: [PATCH] fix errors spotted by usage analysis

---
 ipam/ring/ring.go        | 6 +-----
 ipam/space/space_test.go | 2 +-
 prog/plugin/main.go      | 3 ---
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/ipam/ring/ring.go b/ipam/ring/ring.go
index adc9e87b..1f2c7790 100644
--- a/ipam/ring/ring.go
+++ b/ipam/ring/ring.go
@@ -447,10 +447,7 @@ func (ws weightedPeers) Swap(i, j int)      { ws[i], ws[j] = ws[j], ws[i] }
 // ChoosePeersToAskForSpace returns all peers we can ask for space in
 // the range [start, end), in weighted-random order.  Assumes start<end.
 func (r *Ring) ChoosePeersToAskForSpace(start, end address.Address) []mesh.PeerName {
-	var (
-		sum               address.Offset
-		totalSpacePerPeer = make(map[mesh.PeerName]address.Offset) // Compute total free space per peer
-	)
+	totalSpacePerPeer := make(map[mesh.PeerName]address.Offset)
 
 	// iterate through tokens
 	for i, entry := range r.Entries {
@@ -472,7 +469,6 @@ func (r *Ring) ChoosePeersToAskForSpace(start, end address.Address) []mesh.PeerN
 		}
 
 		totalSpacePerPeer[entry.Peer] += entry.Free
-		sum += entry.Free
 	}
 
 	// Compute weighted random numbers, then sort.
diff --git a/ipam/space/space_test.go b/ipam/space/space_test.go
index 7c17a3bc..7897a7f4 100644
--- a/ipam/space/space_test.go
+++ b/ipam/space/space_test.go
@@ -155,7 +155,7 @@ func TestSpaceFree(t *testing.T) {
 	// Check we are full
 	ok, _ := space.Allocate(entireRange)
 	require.True(t, !ok, "Should have failed to get address")
-	r, ok = space.Donate(entireRange)
+	r, _ = space.Donate(entireRange)
 	require.True(t, r.Size() == 0, "Wrong space")
 
 	// Free in the middle
diff --git a/prog/plugin/main.go b/prog/plugin/main.go
index 0415f4c8..464ab9a9 100644
--- a/prog/plugin/main.go
+++ b/prog/plugin/main.go
@@ -51,7 +51,6 @@ func main() {
 	Log.Println("Weave plugin", version, "Command line options:", os.Args[1:])
 	Log.Info(dockerClient.Info())
 
-	var globalListener, meshListener net.Listener
 	endChan := make(chan error, 1)
 	if address != "" {
 		globalListener, err := listenAndServe(dockerClient, address, nameserver, noMulticastRoute, endChan, "global", false)
@@ -71,8 +70,6 @@ func main() {
 	err = <-endChan
 	if err != nil {
 		Log.Errorf("Error from listener: %s", err)
-		globalListener.Close()
-		meshListener.Close()
 		os.Exit(1)
 	}
 }