From 3118952e0a63b42b830fc846a56b891d14902976 Mon Sep 17 00:00:00 2001 From: Johan Euphrosine Date: Fri, 16 May 2014 12:15:21 -0700 Subject: [PATCH] archive: simplify DetectCompression Docker-DCO-1.1-Signed-off-by: Johan Euphrosine (github: proppy) --- archive/archive.go | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/archive/archive.go b/archive/archive.go index 5d29ce819..c72849097 100644 --- a/archive/archive.go +++ b/archive/archive.go @@ -42,26 +42,12 @@ const ( ) func DetectCompression(source []byte) Compression { - sourceLen := len(source) for compression, m := range map[Compression][]byte{ Bzip2: {0x42, 0x5A, 0x68}, Gzip: {0x1F, 0x8B, 0x08}, Xz: {0xFD, 0x37, 0x7A, 0x58, 0x5A, 0x00}, } { - fail := false - if len(m) > sourceLen { - utils.Debugf("Len too short") - continue - } - i := 0 - for _, b := range m { - if b != source[i] { - fail = true - break - } - i++ - } - if !fail { + if bytes.Compare(m, source[:len(m)]) == 0 { return compression } }