diff options
Diffstat (limited to 'src/pkg/compress/bzip2/bit_reader.go')
| -rw-r--r-- | src/pkg/compress/bzip2/bit_reader.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/pkg/compress/bzip2/bit_reader.go b/src/pkg/compress/bzip2/bit_reader.go index 50f0ec836b..390ee7c926 100644 --- a/src/pkg/compress/bzip2/bit_reader.go +++ b/src/pkg/compress/bzip2/bit_reader.go @@ -7,7 +7,6 @@ package bzip2 import ( "bufio" "io" - "os" ) // bitReader wraps an io.Reader and provides the ability to read values, @@ -18,14 +17,14 @@ type bitReader struct { r byteReader n uint64 bits uint - err os.Error + err error } // bitReader needs to read bytes from an io.Reader. We attempt to cast 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, os.Error) + ReadByte() (byte, error) } func newBitReader(r io.Reader) bitReader { @@ -42,7 +41,7 @@ func newBitReader(r io.Reader) bitReader { func (br *bitReader) ReadBits64(bits uint) (n uint64) { for bits > br.bits { b, err := br.r.ReadByte() - if err == os.EOF { + if err == io.EOF { err = io.ErrUnexpectedEOF } if err != nil { @@ -83,6 +82,6 @@ func (br *bitReader) ReadBit() bool { return n != 0 } -func (br *bitReader) Error() os.Error { +func (br *bitReader) Error() error { return br.err } |