From 829845d26864a61afe7d74c9c2c72f5523d02d08 Mon Sep 17 00:00:00 2001
From: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Date: Tue, 1 Aug 2017 14:42:41 -0700
Subject: [PATCH] Fix ineffassign warnings

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
---
 cmd/ctr/utils.go                    | 2 +-
 container_test.go                   | 2 +-
 progress/bar.go                     | 2 +-
 remotes/docker/schema1/converter.go | 6 ++++++
 snapshot/overlay/overlay_test.go    | 4 ++--
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/cmd/ctr/utils.go b/cmd/ctr/utils.go
index 70270c4ea..7e827b49f 100644
--- a/cmd/ctr/utils.go
+++ b/cmd/ctr/utils.go
@@ -87,7 +87,7 @@ func appContext(clicontext *cli.Context) (gocontext.Context, gocontext.CancelFun
 		ctx       = gocontext.Background()
 		timeout   = clicontext.GlobalDuration("timeout")
 		namespace = clicontext.GlobalString("namespace")
-		cancel    = func() {}
+		cancel    gocontext.CancelFunc
 	)
 
 	ctx = namespaces.WithNamespace(ctx, namespace)
diff --git a/container_test.go b/container_test.go
index 2b423285f..e035d69da 100644
--- a/container_test.go
+++ b/container_test.go
@@ -69,7 +69,7 @@ func TestNewContainer(t *testing.T) {
 	if container.ID() != id {
 		t.Errorf("expected container id %q but received %q", id, container.ID())
 	}
-	if spec, err = container.Spec(); err != nil {
+	if _, err = container.Spec(); err != nil {
 		t.Error(err)
 		return
 	}
diff --git a/progress/bar.go b/progress/bar.go
index fa916efcb..ced8862ef 100644
--- a/progress/bar.go
+++ b/progress/bar.go
@@ -58,7 +58,7 @@ func (h Bar) Format(state fmt.State, r rune) {
 	n += copy(p[n:], []byte(reset))
 
 	if negative > 0 {
-		n += copy(p[n:len(p)-1], bytes.Repeat([]byte("-"), negative))
+		copy(p[n:len(p)-1], bytes.Repeat([]byte("-"), negative))
 	}
 
 	state.Write(p)
diff --git a/remotes/docker/schema1/converter.go b/remotes/docker/schema1/converter.go
index 4459ce94f..7d24d156f 100644
--- a/remotes/docker/schema1/converter.go
+++ b/remotes/docker/schema1/converter.go
@@ -217,6 +217,9 @@ func (c *Converter) fetchBlob(ctx context.Context, desc ocispec.Descriptor) erro
 		defer r.Close()
 
 		gr, err := gzip.NewReader(r)
+		if err != nil {
+			return err
+		}
 		defer gr.Close()
 
 		_, err = io.Copy(calc, gr)
@@ -237,6 +240,9 @@ func (c *Converter) fetchBlob(ctx context.Context, desc ocispec.Descriptor) erro
 
 		eg.Go(func() error {
 			gr, err := gzip.NewReader(pr)
+			if err != nil {
+				return err
+			}
 			defer gr.Close()
 
 			_, err = io.Copy(calc, gr)
diff --git a/snapshot/overlay/overlay_test.go b/snapshot/overlay/overlay_test.go
index 1bd9d923d..5b47f07ae 100644
--- a/snapshot/overlay/overlay_test.go
+++ b/snapshot/overlay/overlay_test.go
@@ -110,8 +110,7 @@ func TestOverlayOverlayMount(t *testing.T) {
 		return
 	}
 	key := "/tmp/test"
-	mounts, err := o.Prepare(ctx, key, "")
-	if err != nil {
+	if _, err = o.Prepare(ctx, key, ""); err != nil {
 		t.Error(err)
 		return
 	}
@@ -119,6 +118,7 @@ func TestOverlayOverlayMount(t *testing.T) {
 		t.Error(err)
 		return
 	}
+	var mounts []mount.Mount
 	if mounts, err = o.Prepare(ctx, "/tmp/layer2", "base"); err != nil {
 		t.Error(err)
 		return