Merge pull request #21274 from jfrazelle/fix-variables-that-werent-being-used

fix variables that werent being called

authorization/authz_unix_test.go

@@ -241,7 +241,7 @@ func (t *authZPluginTestServer) start() {
 	r.HandleFunc("/Plugin.Activate", t.activate)
 	r.HandleFunc("/"+AuthZApiRequest, t.auth)
 	r.HandleFunc("/"+AuthZApiResponse, t.auth)
-	t.listener, err = net.Listen("tcp", pluginAddress)
+	t.listener, _ = net.Listen("tcp", pluginAddress)
 	server := http.Server{Handler: r, Addr: pluginAddress}
 	server.Serve(l)
 }

directory/directory_test.go

@@ -168,6 +168,9 @@ func TestMoveToSubdir(t *testing.T) {
 	}
 	// validate that the files were moved to the subdirectory
 	infos, err := ioutil.ReadDir(subDir)
+	if err != nil {
+		t.Fatal(err)
+	}
 	if len(infos) != 4 {
 		t.Fatalf("Should be four files in the subdir after the migration: actual length: %d", len(infos))
 	}

directory/directory_windows.go

@@ -5,17 +5,10 @@ package directory
 import (
 	"os"
 	"path/filepath"
-
-	"github.com/docker/docker/pkg/longpath"
 )
 
 // Size walks a directory tree and returns its total size in bytes.
 func Size(dir string) (size int64, err error) {
-	fixedPath, err := filepath.Abs(dir)
-	if err != nil {
-		return
-	}
-	fixedPath = longpath.AddPrefix(fixedPath)
 	err = filepath.Walk(dir, func(d string, fileInfo os.FileInfo, e error) error {
 		// Ignore directory sizes
 		if fileInfo == nil {

jsonlog/jsonlog_marshalling.go

@@ -93,7 +93,7 @@ func (mj *JSONLog) MarshalJSONBuf(buf *bytes.Buffer) error {
 		ffjsonWriteJSONString(buf, mj.Log)
 	}
 	if len(mj.Stream) != 0 {
-		if first == true {
+		if first {
 			first = false
 		} else {
 			buf.WriteString(`,`)
@@ -101,9 +101,7 @@ func (mj *JSONLog) MarshalJSONBuf(buf *bytes.Buffer) error {
 		buf.WriteString(`"stream":`)
 		ffjsonWriteJSONString(buf, mj.Stream)
 	}
-	if first == true {
-		first = false
-	} else {
+	if !first {
 		buf.WriteString(`,`)
 	}
 	buf.WriteString(`"time":`)

jsonlog/jsonlogbytes.go

@@ -39,7 +39,7 @@ func (mj *JSONLogs) MarshalJSONBuf(buf *bytes.Buffer) error {
 		ffjsonWriteJSONString(buf, mj.Stream)
 	}
 	if len(mj.RawAttrs) > 0 {
-		if first == true {
+		if first {
 			first = false
 		} else {
 			buf.WriteString(`,`)
@@ -47,9 +47,7 @@ func (mj *JSONLogs) MarshalJSONBuf(buf *bytes.Buffer) error {
 		buf.WriteString(`"attrs":`)
 		buf.Write(mj.RawAttrs)
 	}
-	if first == true {
-		first = false
-	} else {
+	if !first {
 		buf.WriteString(`,`)
 	}
 	buf.WriteString(`"time":`)

mount/sharedsubtree_linux.go

@@ -61,8 +61,7 @@ func ensureMountedAs(mountPoint, options string) error {
 			return err
 		}
 	}
-	mounted, err = Mounted(mountPoint)
-	if err != nil {
+	if _, err = Mounted(mountPoint); err != nil {
 		return err
 	}
 

pools/pools_test.go

@@ -112,8 +112,7 @@ func TestBufioWriterPoolPutAndGet(t *testing.T) {
 	buf.Reset()
 	BufioWriter32KPool.Put(writer)
 	// Try to write something
-	written, err = writer.Write([]byte("barfoo"))
-	if err != nil {
+	if _, err = writer.Write([]byte("barfoo")); err != nil {
 		t.Fatal(err)
 	}
 	// If we now try to flush it, it should panic (the writer is nil)

symlink/fs_windows.go

@@ -23,8 +23,7 @@ func toShort(path string) (string, error) {
 	}
 	if n > uint32(len(b)) {
 		b = make([]uint16, n)
-		n, err = syscall.GetShortPathName(&p[0], &b[0], uint32(len(b)))
-		if err != nil {
+		if _, err = syscall.GetShortPathName(&p[0], &b[0], uint32(len(b))); err != nil {
 			return "", err
 		}
 	}

tarsum/tarsum_test.go

@@ -560,6 +560,10 @@ func Benchmark9kTar(b *testing.B) {
 		return
 	}
 	n, err := io.Copy(buf, fh)
+	if err != nil {
+		b.Error(err)
+		return
+	}
 	fh.Close()
 
 	reader := bytes.NewReader(buf.Bytes())
@@ -586,6 +590,10 @@ func Benchmark9kTarGzip(b *testing.B) {
 		return
 	}
 	n, err := io.Copy(buf, fh)
+	if err != nil {
+		b.Error(err)
+		return
+	}
 	fh.Close()
 
 	reader := bytes.NewReader(buf.Bytes())