From 2b11da50bffe48d14bfdf6bada038611ad0ce176 Mon Sep 17 00:00:00 2001 From: unclejack Date: Thu, 30 Mar 2017 12:04:42 +0300 Subject: [PATCH] pkg/{chroot,}archive: clean up a few small issues Signed-off-by: Cristian Staretu Upstream-commit: 087f7307a66a347bea9335c614a28f8c2fa7ddcb Component: engine --- components/engine/pkg/archive/archive.go | 2 +- components/engine/pkg/archive/archive_unix.go | 5 +---- components/engine/pkg/archive/changes.go | 4 ++-- components/engine/pkg/chrootarchive/archive_test.go | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/components/engine/pkg/archive/archive.go b/components/engine/pkg/archive/archive.go index f521388d1f..194d76a8c7 100644 --- a/components/engine/pkg/archive/archive.go +++ b/components/engine/pkg/archive/archive.go @@ -145,7 +145,7 @@ func DetectCompression(source []byte) Compression { logrus.Debug("Len too short") continue } - if bytes.Compare(m, source[:len(m)]) == 0 { + if bytes.Equal(m, source[:len(m)]) { return compression } } diff --git a/components/engine/pkg/archive/archive_unix.go b/components/engine/pkg/archive/archive_unix.go index d94858887d..68d3c97d27 100644 --- a/components/engine/pkg/archive/archive_unix.go +++ b/components/engine/pkg/archive/archive_unix.go @@ -107,10 +107,7 @@ func handleTarTypeBlockCharFifo(hdr *tar.Header, path string) error { mode |= syscall.S_IFIFO } - if err := system.Mknod(path, mode, int(system.Mkdev(hdr.Devmajor, hdr.Devminor))); err != nil { - return err - } - return nil + return system.Mknod(path, mode, int(system.Mkdev(hdr.Devmajor, hdr.Devminor))) } func handleLChmod(hdr *tar.Header, path string, hdrInfo os.FileInfo) error { diff --git a/components/engine/pkg/archive/changes.go b/components/engine/pkg/archive/changes.go index c07d55cbd9..ca2c0ca1bf 100644 --- a/components/engine/pkg/archive/changes.go +++ b/components/engine/pkg/archive/changes.go @@ -267,7 +267,7 @@ func (info *FileInfo) addChanges(oldInfo *FileInfo, changes *[]Change) { } for name, newChild := range info.children { - oldChild, _ := oldChildren[name] + oldChild := oldChildren[name] if oldChild != nil { // change? oldStat := oldChild.stat @@ -279,7 +279,7 @@ func (info *FileInfo) addChanges(oldInfo *FileInfo, changes *[]Change) { // breaks down is if some code intentionally hides a change by setting // back mtime if statDifferent(oldStat, newStat) || - bytes.Compare(oldChild.capability, newChild.capability) != 0 { + !bytes.Equal(oldChild.capability, newChild.capability) { change := Change{ Path: newChild.path(), Kind: ChangeModify, diff --git a/components/engine/pkg/chrootarchive/archive_test.go b/components/engine/pkg/chrootarchive/archive_test.go index d2d7e621f5..80e54a0edc 100644 --- a/components/engine/pkg/chrootarchive/archive_test.go +++ b/components/engine/pkg/chrootarchive/archive_test.go @@ -77,7 +77,7 @@ func TestChrootUntarWithHugeExcludesList(t *testing.T) { options := &archive.TarOptions{} //65534 entries of 64-byte strings ~= 4MB of environment space which should overflow //on most systems when passed via environment or command line arguments - excludes := make([]string, 65534, 65534) + excludes := make([]string, 65534) for i := 0; i < 65534; i++ { excludes[i] = strings.Repeat(string(i), 64) }