diff --git a/lib/rac/rac_test.go b/lib/rac/rac_test.go index 5fa2d112..d2903fb3 100644 --- a/lib/rac/rac_test.go +++ b/lib/rac/rac_test.go @@ -549,10 +549,12 @@ loop: func TestReaderEmpty(t *testing.T) { encoded := undoHexDump(writerWantEmpty) - got, err := ioutil.ReadAll(&Reader{ + r := &Reader{ ReadSeeker: bytes.NewReader(encoded), CompressedSize: int64(len(encoded)), - }) + } + defer r.Close() + got, err := ioutil.ReadAll(r) if err != nil { t.Fatalf("ReadAll: %v", err) } @@ -574,10 +576,12 @@ func TestReaderZeroes(t *testing.T) { t.Fatalf("Close: %v", err) } encoded := buf.Bytes() - got, err := ioutil.ReadAll(&Reader{ + r := &Reader{ ReadSeeker: bytes.NewReader(encoded), CompressedSize: int64(len(encoded)), - }) + } + defer r.Close() + got, err := ioutil.ReadAll(r) if err != nil { t.Fatalf("ReadAll: %v", err) } diff --git a/lib/rac/reader.go b/lib/rac/reader.go index 1672d5eb..4d46a6fd 100644 --- a/lib/rac/reader.go +++ b/lib/rac/reader.go @@ -64,7 +64,7 @@ type CodecReader interface { // // Do not modify its exported fields after calling any of its methods. // -// Reader implements the io.ReadSeeker interface. +// Reader implements the io.ReadSeeker and io.Closer interfaces. type Reader struct { // ReadSeeker is where the RAC-encoded data is read from. // @@ -421,3 +421,8 @@ func (r *Reader) Seek(offset int64, whence int) (int64, error) { } return r.pos, nil } + +// Close implements io.Closer. +func (r *Reader) Close() error { + return nil +} diff --git a/lib/raczlib/example_test.go b/lib/raczlib/example_test.go index c33fc1f5..8377bffe 100644 --- a/lib/raczlib/example_test.go +++ b/lib/raczlib/example_test.go @@ -75,6 +75,7 @@ func Example_roundTrip() { CompressedSize: int64(len(compressed)), CodecReaders: []rac.CodecReader{&raczlib.CodecReader{}}, } + defer r.Close() // Read the whole file. wBuf := &bytes.Buffer{} diff --git a/lib/raczlib/raczlib_test.go b/lib/raczlib/raczlib_test.go index c88def44..aba447da 100644 --- a/lib/raczlib/raczlib_test.go +++ b/lib/raczlib/raczlib_test.go @@ -82,6 +82,7 @@ func racDecompress(compressed []byte) ([]byte, error) { CompressedSize: int64(len(compressed)), CodecReaders: []rac.CodecReader{&CodecReader{}}, } + defer r.Close() if _, err := io.Copy(buf, r); err != nil { return nil, err } @@ -202,6 +203,7 @@ func TestZeroedBytes(t *testing.T) { CompressedSize: int64(len(compressed)), CodecReaders: []rac.CodecReader{&CodecReader{}}, } + defer r.Close() for j := 0; j <= len(original); j++ { want := original[j:] got := make([]byte, len(want)) @@ -306,6 +308,7 @@ func testReadSeeker(t *testing.T, rs io.ReadSeeker) { CompressedSize: int64(len(encodedSheep)), CodecReaders: []rac.CodecReader{&CodecReader{}}, } + defer r.Close() if _, err := io.Copy(buf, r); err != nil { t.Fatalf("io.Copy: %v", err) }