From d68e9faee20a1032e6a425f3fcc253f948f9c736 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 14 Apr 2022 10:02:35 -0400 Subject: Update vendor of storage,common Signed-off-by: Daniel J Walsh --- vendor/github.com/containerd/stargz-snapshotter/estargz/estargz.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'vendor/github.com/containerd/stargz-snapshotter/estargz/estargz.go') diff --git a/vendor/github.com/containerd/stargz-snapshotter/estargz/estargz.go b/vendor/github.com/containerd/stargz-snapshotter/estargz/estargz.go index 4b655c145..921e59ec6 100644 --- a/vendor/github.com/containerd/stargz-snapshotter/estargz/estargz.go +++ b/vendor/github.com/containerd/stargz-snapshotter/estargz/estargz.go @@ -31,7 +31,6 @@ import ( "fmt" "hash" "io" - "io/ioutil" "os" "path" "sort" @@ -579,7 +578,7 @@ func (fr *fileReader) ReadAt(p []byte, off int64) (n int, err error) { return 0, fmt.Errorf("fileReader.ReadAt.decompressor.Reader: %v", err) } defer dr.Close() - if n, err := io.CopyN(ioutil.Discard, dr, off); n != off || err != nil { + if n, err := io.CopyN(io.Discard, dr, off); n != off || err != nil { return 0, fmt.Errorf("discard of %d bytes = %v, %v", off, n, err) } return io.ReadFull(dr, p) @@ -933,7 +932,7 @@ func (w *Writer) appendTar(r io.Reader, lossless bool) error { } } } - remainDest := ioutil.Discard + remainDest := io.Discard if lossless { remainDest = dst // Preserve the remaining bytes in lossless mode } -- cgit v1.2.3-54-g00ecf