mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-22 00:47:28 +01:00
Refactor rac io.EOF / io.ErrUnexpectedEOF checks
This commit is contained in:
1 parent
f4abc0ffe4
commit
b7b4e308ba
2 files changed
+10
-9
No files matched your search
+10
-3
@@ -290,9 +290,10 @@ func (r *Reader) readImplicitZeroes(p []byte) (int, error) {
|
|||||||
// r.err "sticky error" field stays nil.
|
// r.err "sticky error" field stays nil.
|
||||||
func (r *Reader) nextChunk() error {
|
func (r *Reader) nextChunk() error {
|
||||||
chunk, err := r.parser.NextChunk()
|
chunk, err := r.parser.NextChunk()
|
||||||
if err == io.EOF {
|
if err != nil {
|
||||||
return io.EOF
|
if err == io.EOF {
|
||||||
} else if err != nil {
|
return io.EOF
|
||||||
|
}
|
||||||
r.err = err
|
r.err = err
|
||||||
return r.err
|
return r.err
|
||||||
}
|
}
|
||||||
@@ -315,6 +316,9 @@ func (r *Reader) nextChunk() error {
|
|||||||
|
|
||||||
rctx, err := codecReader.MakeReaderContext(r.ReadSeeker, r.CompressedSize, chunk)
|
rctx, err := codecReader.MakeReaderContext(r.ReadSeeker, r.CompressedSize, chunk)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
if err == io.EOF {
|
||||||
|
err = io.ErrUnexpectedEOF
|
||||||
|
}
|
||||||
r.err = err
|
r.err = err
|
||||||
return r.err
|
return r.err
|
||||||
}
|
}
|
||||||
@@ -331,6 +335,9 @@ func (r *Reader) nextChunk() error {
|
|||||||
|
|
||||||
decompressor, err := codecReader.MakeDecompressor(&r.currChunk, rctx)
|
decompressor, err := codecReader.MakeDecompressor(&r.currChunk, rctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
if err == io.EOF {
|
||||||
|
err = io.ErrUnexpectedEOF
|
||||||
|
}
|
||||||
r.err = err
|
r.err = err
|
||||||
return r.err
|
return r.err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -75,9 +75,6 @@ func (r *CodecReader) MakeDecompressor(
|
|||||||
|
|
||||||
if r.cachedZlibReader != nil {
|
if r.cachedZlibReader != nil {
|
||||||
if err := r.cachedZlibReader.Reset(compressed, rctx.Secondary); err != nil {
|
if err := r.cachedZlibReader.Reset(compressed, rctx.Secondary); err != nil {
|
||||||
if err == io.EOF {
|
|
||||||
err = io.ErrUnexpectedEOF
|
|
||||||
}
|
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return r.cachedZlibReader.(io.Reader), nil
|
return r.cachedZlibReader.(io.Reader), nil
|
||||||
@@ -85,9 +82,6 @@ func (r *CodecReader) MakeDecompressor(
|
|||||||
|
|
||||||
zlibReader, err := zlib.NewReaderDict(compressed, rctx.Secondary)
|
zlibReader, err := zlib.NewReaderDict(compressed, rctx.Secondary)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if err == io.EOF {
|
|
||||||
err = io.ErrUnexpectedEOF
|
|
||||||
}
|
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
r.cachedZlibReader = zlibReader.(zlib.Resetter)
|
r.cachedZlibReader = zlibReader.(zlib.Resetter)
|
||||||
|
|||||||
Reference in new issue
Block a user