Prepare to generalize a raczlib.Reader

This commit is contained in:
Nigel Tao committed 2019-08-06 11:40:58 +10:00
1 parent e2a41c4c42
commit 93870d0d1d
1 file changed
+8 -6
+8 -6
View File
@@ -106,7 +106,7 @@ type Reader struct {
// Calling Seek may reset the state machine to "State A".
//
// The initial state is "State A".
zlibReader io.ReadCloser
zlibReader io.Reader
inImplicitZeroes bool
// buf is a scratch buffer.
@@ -249,12 +249,14 @@ func (r *Reader) readExplicitData(p []byte) (int, error) {
}
func (r *Reader) transitionFromStateBToStateC() error {
if err := r.zlibReader.Close(); err != nil {
if err == io.EOF {
err = io.ErrUnexpectedEOF
if c, ok := r.zlibReader.(io.Closer); ok {
if err := c.Close(); err != nil {
if err == io.EOF {
err = io.ErrUnexpectedEOF
}
r.err = err
return r.err
}
r.err = err
return r.err
}
r.zlibReader = nil
r.inImplicitZeroes = true