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

backend: rename LimitReader to LimitReadCloser

This commit is contained in:
Alexander Neumann 2015-05-02 16:13:56 +02:00
parent 0ca678228d
commit 1f94ac724f
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/generic.go
View File

@ -100,7 +100,7 @@ outer:
// wrap around io.LimitedReader that implements io.ReadCloser // wrap around io.LimitedReader that implements io.ReadCloser
type blobReader struct { type blobReader struct {
f io.Closer cl io.Closer
rd io.Reader rd io.Reader
closed bool closed bool
} }
@ -120,7 +120,7 @@ func (l *blobReader) Close() error {
} }
if !l.closed { if !l.closed {
err := l.f.Close() err := l.cl.Close()
l.closed = true l.closed = true
return err return err
} }
@ -128,6 +128,8 @@ func (l *blobReader) Close() error {
return nil return nil
} }
func LimitReader(f io.ReadCloser, n int64) *blobReader { // LimitReadCloser returns a new reader wraps r in an io.LimitReader, but also
return &blobReader{f: f, rd: io.LimitReader(f, n)} // implements the Close() method.
func LimitReadCloser(r io.ReadCloser, n int64) *blobReader {
return &blobReader{cl: r, rd: io.LimitReader(r, n)}
} }

2
backend/local/local.go
View File

@ -312,7 +312,7 @@ func (b *Local) GetReader(t backend.Type, name string, offset, length uint) (io.
return f, nil return f, nil
} }
return backend.LimitReader(f, int64(length)), nil return backend.LimitReadCloser(f, int64(length)), nil
} }
// Test returns true if a blob of the given type and name exists in the backend. // Test returns true if a blob of the given type and name exists in the backend.

2
backend/sftp/sftp.go
View File

@ -446,7 +446,7 @@ func (r *SFTP) GetReader(t backend.Type, name string, offset, length uint) (io.R
return f, nil return f, nil
} }
return backend.LimitReader(f, int64(length)), nil return backend.LimitReadCloser(f, int64(length)), nil
} }
// Test returns true if a blob of the given type and name exists in the backend. // Test returns true if a blob of the given type and name exists in the backend.