Merge pull request #154 from mikebrow/cleanup-nits

estesp · web-flow · commit f1c9af8e2a20 · 2020-07-06T09:46:02.000-04:00
Cleanup gofmt issues; regen Authors; reduce some code complexity in samefile comparison
diff --git a/AUTHORS b/AUTHORS
@@ -1,16 +1,36 @@
 Aaron Lehmann <aaron.lehmann@docker.com>
 Akash Gupta <akagup@microsoft.com>
+Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
+Akihiro Suda <suda.kyoto@gmail.com>
 Andrew Pennebaker <apennebaker@datapipe.com>
 Brandon Philips <brandon.philips@coreos.com>
+Brian Goff <cpuguy83@gmail.com>
 Christopher Jones <tophj@linux.vnet.ibm.com>
 Daniel, Dao Quang Minh <dqminh89@gmail.com>
+Darren Stahl <darst@microsoft.com>
+Derek McGowan <derek@mcg.dev>
 Derek McGowan <derek@mcgstyle.net>
 Edward Pilatowicz <edward.pilatowicz@oracle.com>
 Ian Campbell <ijc@docker.com>
+Ivan Markin <sw@nogoegst.net>
 Justin Cormack <justin.cormack@docker.com>
 Justin Cummins <sul3n3t@gmail.com>
+Kasper Fabæch Brandt <poizan@poizan.dk>
+Kir Kolyshkin <kolyshkin@gmail.com>
+Michael Crosby <crosbymichael@gmail.com>
+Michael Wan <zirenwan@gmail.com>
+Niels de Vos <ndevos@redhat.com>
 Phil Estes <estesp@gmail.com>
+Phil Estes <estesp@linux.vnet.ibm.com>
+Sam Whited <sam@samwhited.com>
+Shengjing Zhu <zhsj@debian.org>
 Stephen J Day <stephen.day@docker.com>
+Tibor Vass <tibor@docker.com>
 Tobias Klauser <tklauser@distanz.ch>
+Tom Faulhaber <tffaulha@amazon.com>
 Tonis Tiigi <tonistiigi@gmail.com>
+Trevor Porter <trkporter@ucdavis.edu>
+Wei Fu <fuweid89@gmail.com>
+Wilbert van de Ridder <wilbert.ridder@gmail.com>
+Xiaodong Ye <xiaodongy@vmware.com>
diff --git a/fs/copy_linux_test.go b/fs/copy_linux_test.go
@@ -20,11 +20,11 @@ package fs
 
 import (
 	"io"
-	"path/filepath"
-	"math/rand"
 	"io/ioutil"
+	"math/rand"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"testing"
 
 	"github.com/containerd/continuity/testutil"
@@ -59,7 +59,7 @@ func TestCopyReflinkWithXFS(t *testing.T) {
 	}
 	unmounted := false
 	defer func() {
-		if !unmounted{
+		if !unmounted {
 			testutil.Unmount(t, mnt)
 		}
 		loop.Close()
diff --git a/fs/path.go b/fs/path.go
@@ -117,17 +117,13 @@ func sameFile(f1, f2 *currentPath) (bool, error) {
 		// If the timestamp may have been truncated in both of the
 		// files, check content of file to determine difference
 		if t1.Nanosecond() == 0 && t2.Nanosecond() == 0 {
-			var eq bool
 			if (f1.f.Mode() & os.ModeSymlink) == os.ModeSymlink {
-				eq, err = compareSymlinkTarget(f1.fullPath, f2.fullPath)
-			} else if f1.f.Size() > 0 {
-				eq, err = compareFileContent(f1.fullPath, f2.fullPath)
-			} else {
-				eq, err = true, nil // if file sizes are zero length, the files are the same by definition
+				return compareSymlinkTarget(f1.fullPath, f2.fullPath)
 			}
-			if err != nil || !eq {
-				return eq, err
+			if f1.f.Size() == 0 { // if file sizes are zero length, the files are the same by definition
+				return true, nil
 			}
+			return compareFileContent(f1.fullPath, f2.fullPath)
 		} else if t1.Nanosecond() != t2.Nanosecond() {
 			return false, nil
 		}
diff --git a/testutil/loopback/loopback_linux.go b/testutil/loopback/loopback_linux.go
@@ -22,8 +22,8 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
-	"syscall"
 	"strings"
+	"syscall"
 
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -70,9 +70,9 @@ func New(size int64) (*Loopback, error) {
 	}
 
 	l := Loopback{
-		File: file.Name(),
+		File:   file.Name(),
 		Device: deviceName,
-		close: cleanup,
+		close:  cleanup,
 	}
 	return &l, nil
 }
@@ -83,7 +83,7 @@ type Loopback struct {
 	File string
 	// Device is /dev/loopX
 	Device string
-	close func() error
+	close  func() error
 }
 
 // SoftSize returns st_size

-Original file line number
+Diff line change
@@ @@ -1,16 +1,36 @@ @@
 Aaron Lehmann <[email protected]>
 Akash Gupta <[email protected]>
 +Akihiro Suda <[email protected]>
 Akihiro Suda <[email protected]>
 +Akihiro Suda <[email protected]>
 Andrew Pennebaker <[email protected]>
 Brandon Philips <[email protected]>
 +Brian Goff <[email protected]>
 Christopher Jones <[email protected]>
 Daniel, Dao Quang Minh <[email protected]>
 +Darren Stahl <[email protected]>
 +Derek McGowan <[email protected]>
 Derek McGowan <[email protected]>
 Edward Pilatowicz <[email protected]>
 Ian Campbell <[email protected]>
 +Ivan Markin <[email protected]>
 Justin Cormack <[email protected]>
 Justin Cummins <[email protected]>
 +Kasper Fabæch Brandt <[email protected]>
 +Kir Kolyshkin <[email protected]>
 +Michael Crosby <[email protected]>
 +Michael Wan <[email protected]>
 +Niels de Vos <[email protected]>
 Phil Estes <[email protected]>
 +Phil Estes <[email protected]>
 +Sam Whited <[email protected]>
 +Shengjing Zhu <[email protected]>
 Stephen J Day <[email protected]>
 +Tibor Vass <[email protected]>
 Tobias Klauser <[email protected]>
 +Tom Faulhaber <[email protected]>
 Tonis Tiigi <[email protected]>
 +Trevor Porter <[email protected]>
 +Wei Fu <[email protected]>
 +Wilbert van de Ridder <[email protected]>
 +Xiaodong Ye <[email protected]>