From f3316c595fa37f5875ae1b9922b35ec37b38de9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Mon, 26 Sep 2022 22:31:35 +0200 Subject: [PATCH] Only pass an io.Reader to invokeUnpack MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... which allows us to remove an unnecessary NopCloser. Should not change behavior. Signed-off-by: Miloslav Trmač --- pkg/chrootarchive/archive.go | 2 +- pkg/chrootarchive/archive_darwin.go | 2 +- pkg/chrootarchive/archive_windows.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/chrootarchive/archive.go b/pkg/chrootarchive/archive.go index b5d8961e5..2de95f39a 100644 --- a/pkg/chrootarchive/archive.go +++ b/pkg/chrootarchive/archive.go @@ -82,7 +82,7 @@ func untarHandler(tarArchive io.Reader, dest string, options *archive.TarOptions } } - r := io.NopCloser(tarArchive) + r := tarArchive if decompress { decompressedArchive, err := archive.DecompressStream(tarArchive) if err != nil { diff --git a/pkg/chrootarchive/archive_darwin.go b/pkg/chrootarchive/archive_darwin.go index e25429cd4..42ee39f48 100644 --- a/pkg/chrootarchive/archive_darwin.go +++ b/pkg/chrootarchive/archive_darwin.go @@ -6,7 +6,7 @@ import ( "github.com/containers/storage/pkg/archive" ) -func invokeUnpack(decompressedArchive io.ReadCloser, +func invokeUnpack(decompressedArchive io.Reader, dest string, options *archive.TarOptions, root string) error { return archive.Unpack(decompressedArchive, dest, options) diff --git a/pkg/chrootarchive/archive_windows.go b/pkg/chrootarchive/archive_windows.go index 8a5c680b1..1395ff8cd 100644 --- a/pkg/chrootarchive/archive_windows.go +++ b/pkg/chrootarchive/archive_windows.go @@ -12,7 +12,7 @@ func chroot(path string) error { return nil } -func invokeUnpack(decompressedArchive io.ReadCloser, +func invokeUnpack(decompressedArchive io.Reader, dest string, options *archive.TarOptions, root string) error { // Windows is different to Linux here because Windows does not support