From 422da762b7dd63c54de9b39a4f7f3283f5d0afeb Mon Sep 17 00:00:00 2001 From: Anthony Martin Date: Fri, 12 Oct 2012 14:09:24 -0700 Subject: [PATCH] compress/bzip2: use io.ByteReader instead of internal interface R=golang-dev, bradfitz CC=golang-dev https://golang.org/cl/6663044 --- src/pkg/compress/bzip2/bit_reader.go | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/pkg/compress/bzip2/bit_reader.go b/src/pkg/compress/bzip2/bit_reader.go index b35c69a1cc..0141d469c3 100644 --- a/src/pkg/compress/bzip2/bit_reader.go +++ b/src/pkg/compress/bzip2/bit_reader.go @@ -14,21 +14,16 @@ import ( // because the error handling was verbose. Instead, any error is kept and can // be checked afterwards. type bitReader struct { - r byteReader + r io.ByteReader n uint64 bits uint err error } -// bitReader needs to read bytes from an io.Reader. We attempt to convert the -// given io.Reader to this interface and, if it doesn't already fit, we wrap in -// a bufio.Reader. -type byteReader interface { - ReadByte() (byte, error) -} - +// newBitReader returns a new bitReader reading from r. If r is not +// already an io.ByteReader, it will be converted via a bufio.Reader. func newBitReader(r io.Reader) bitReader { - byter, ok := r.(byteReader) + byter, ok := r.(io.ByteReader) if !ok { byter = bufio.NewReader(r) } -- 2.48.1