MyFavMirrors
/
minio
mirror of https://github.com/minio/minio.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use io.NopCloser replace closeWrapper (#20287)

This commit is contained in:
jiuker 2024-08-21 20:20:54 +08:00 committed by GitHub
parent 7b239ae154
commit 1e1bd3afd9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/bitrot-streaming.go
View File

@ -141,13 +141,7 @@ func (b *streamingBitrotReader) Close() error {
} }
if closer, ok := b.rc.(io.Closer); ok { if closer, ok := b.rc.(io.Closer); ok {
// drain the body for connection reuse at network layer. // drain the body for connection reuse at network layer.
xhttp.DrainBody(struct { xhttp.DrainBody(io.NopCloser(b.rc))
io.Reader
io.Closer
}{
Reader: b.rc,
Closer: closeWrapper(func() error { return nil }),
})
return closer.Close() return closer.Close()
} }
return nil return nil

8
cmd/xl-storage.go
View File

@ -2079,14 +2079,6 @@ func (s *xlStorage) ReadFileStream(ctx context.Context, volume, path string, off
return &sendFileReader{Reader: io.LimitReader(file, length), Closer: file}, nil return &sendFileReader{Reader: io.LimitReader(file, length), Closer: file}, nil
} }
// closeWrapper converts a function to an io.Closer
type closeWrapper func() error
// Close calls the wrapped function.
func (c closeWrapper) Close() error {
return c()
}
// CreateFile - creates the file. // CreateFile - creates the file.
func (s *xlStorage) CreateFile(ctx context.Context, origvolume, volume, path string, fileSize int64, r io.Reader) (err error) { func (s *xlStorage) CreateFile(ctx context.Context, origvolume, volume, path string, fileSize int64, r io.Reader) (err error) {
if origvolume != "" { if origvolume != "" {