From 35932cdeecd4adbd3218a65785cc9c511658e040 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 8 Jan 2025 18:29:44 +0100 Subject: [PATCH] pkg/ioutils: un-export readCloserWrapper This type was exported in fd35494a251a497c359f706f61f33e689e2af678 to be used in tests in pkg/archive. It's no longer used in pkg/archive since ba90fd8da0734dc109ce0147eba4fb1e877127a0, so we can un-export it. Signed-off-by: Sebastiaan van Stijn --- pkg/ioutils/readers.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/ioutils/readers.go b/pkg/ioutils/readers.go index 3d47e6d0f1..6c209eafab 100644 --- a/pkg/ioutils/readers.go +++ b/pkg/ioutils/readers.go @@ -2,29 +2,28 @@ package ioutils // import "github.com/docker/docker/pkg/ioutils" import ( "context" - "io" - "runtime/debug" - "sync/atomic" - // make sure crypto.SHA256, crypto.sha512 and crypto.SHA384 are registered // TODO remove once https://github.com/opencontainers/go-digest/pull/64 is merged. _ "crypto/sha256" _ "crypto/sha512" + "io" + "runtime/debug" + "sync/atomic" "github.com/containerd/log" ) -// ReadCloserWrapper wraps an io.Reader, and implements an io.ReadCloser +// readCloserWrapper wraps an io.Reader, and implements an io.ReadCloser // It calls the given callback function when closed. It should be constructed // with NewReadCloserWrapper -type ReadCloserWrapper struct { +type readCloserWrapper struct { io.Reader closer func() error closed atomic.Bool } // Close calls back the passed closer function -func (r *ReadCloserWrapper) Close() error { +func (r *readCloserWrapper) Close() error { if !r.closed.CompareAndSwap(false, true) { subsequentCloseWarn("ReadCloserWrapper") return nil @@ -32,9 +31,10 @@ func (r *ReadCloserWrapper) Close() error { return r.closer() } -// NewReadCloserWrapper returns a new io.ReadCloser. +// NewReadCloserWrapper wraps an io.Reader, and implements an io.ReadCloser. +// It calls the given callback function when closed. func NewReadCloserWrapper(r io.Reader, closer func() error) io.ReadCloser { - return &ReadCloserWrapper{ + return &readCloserWrapper{ Reader: r, closer: closer, }