From ac1cf633c72d14a319b1ff707ba5665661287667 Mon Sep 17 00:00:00 2001
From: Paul Bellamy <paul.a.bellamy@gmail.com>
Date: Tue, 1 Dec 2015 16:09:41 +0000
Subject: [PATCH] clarify some variable shadowing

---
 proxy/proxy.go | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/proxy/proxy.go b/proxy/proxy.go
index d267a610..bf14cb76 100644
--- a/proxy/proxy.go
+++ b/proxy/proxy.go
@@ -568,7 +568,7 @@ func (proxy *Proxy) symlink(unixAddrs []string) (err error) {
 		proxy.normalisedAddrs = append(proxy.normalisedAddrs, addr)
 	}
 	if len(froms) == 0 {
-		return nil
+		return
 	}
 
 	env := []string{
@@ -589,7 +589,7 @@ func (proxy *Proxy) symlink(unixAddrs []string) (err error) {
 		HostConfig: &docker.HostConfig{Binds: binds},
 	})
 	if err != nil {
-		return err
+		return
 	}
 
 	defer func() {
@@ -599,8 +599,9 @@ func (proxy *Proxy) symlink(unixAddrs []string) (err error) {
 		}
 	}()
 
-	if err := proxy.client.StartContainer(container.ID, nil); err != nil {
-		return err
+	err = proxy.client.StartContainer(container.ID, nil)
+	if err != nil {
+		return
 	}
 
 	var buf bytes.Buffer
@@ -611,15 +612,16 @@ func (proxy *Proxy) symlink(unixAddrs []string) (err error) {
 		Stderr:      true,
 	})
 	if err != nil {
-		return err
+		return
 	}
 
-	rc, err := proxy.client.WaitContainer(container.ID)
+	var rc int
+	rc, err = proxy.client.WaitContainer(container.ID)
 	if err != nil {
-		return err
+		return
 	}
 	if rc != 0 {
-		return errors.New(buf.String())
+		err = errors.New(buf.String())
 	}
-	return nil
+	return
 }