diff options
| author | 2025-11-22 08:00:00 +0800 | |
|---|---|---|
| committer | 2025-11-22 08:00:00 +0800 | |
| commit | 9b453a7cca6bb258a8ca939dc9696fabd77b1b7c (patch) | |
| tree | 27f28df16a5f00f79021f9bd4d6d540435c9d2f8 /internal/flatex/slice_inflate.go | |
| parent | flatex: Remove the stale readByte(s) wrappers and just directly index the buffer (diff) | |
zlib, flatex: Remove code related to dicts
Git never uses them
Diffstat (limited to 'internal/flatex/slice_inflate.go')
| -rw-r--r-- | internal/flatex/slice_inflate.go | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/internal/flatex/slice_inflate.go b/internal/flatex/slice_inflate.go index d16a6441..3e07e744 100644 --- a/internal/flatex/slice_inflate.go +++ b/internal/flatex/slice_inflate.go @@ -21,7 +21,7 @@ type sliceInflater struct { bits *[maxNumLit + maxNumDist]int codebits *[numCodes]int - dict dictDecoder + window windowDecoder toRead []byte step func(*sliceInflater) @@ -33,18 +33,18 @@ type sliceInflater struct { copyDist int } -func (f *sliceInflater) reset(src []byte, dict []byte) error { +func (f *sliceInflater) reset(src []byte) error { bits := f.bits codebits := f.codebits - dictState := f.dict + windowState := f.window *f = sliceInflater{ input: src, bits: bits, codebits: codebits, - dict: dictState, + window: windowState, step: (*sliceInflater).nextBlock, } - f.dict.init(maxMatchOffset, dict) + f.window.init(maxMatchOffset) return nil } @@ -103,9 +103,9 @@ readLiteral: var length int switch { case v < 256: - f.dict.writeByte(byte(v)) - if f.dict.availWrite() == 0 { - f.toRead = f.dict.readFlush() + f.window.writeByte(byte(v)) + if f.window.availWrite() == 0 { + f.toRead = f.window.readFlush() f.step = (*sliceInflater).huffmanBlock f.stepState = stateInit return @@ -190,7 +190,7 @@ readLiteral: return } - if dist > f.dict.histSize() { + if dist > f.window.histSize() { f.err = CorruptInputError(f.roffset) return } @@ -201,14 +201,14 @@ readLiteral: copyHistory: { - cnt := f.dict.tryWriteCopy(f.copyDist, f.copyLen) + cnt := f.window.tryWriteCopy(f.copyDist, f.copyLen) if cnt == 0 { - cnt = f.dict.writeCopy(f.copyDist, f.copyLen) + cnt = f.window.writeCopy(f.copyDist, f.copyLen) } f.copyLen -= cnt - if f.dict.availWrite() == 0 || f.copyLen > 0 { - f.toRead = f.dict.readFlush() + if f.window.availWrite() == 0 || f.copyLen > 0 { + f.toRead = f.window.readFlush() f.step = (*sliceInflater).huffmanBlock f.stepState = stateDict return @@ -237,7 +237,7 @@ func (f *sliceInflater) dataBlock() { } if n == 0 { - f.toRead = f.dict.readFlush() + f.toRead = f.window.readFlush() f.finishBlock() return } @@ -252,9 +252,9 @@ func (f *sliceInflater) copyData() { f.finishBlock() return } - buf := f.dict.writeSlice() + buf := f.window.writeSlice() if len(buf) == 0 { - f.toRead = f.dict.readFlush() + f.toRead = f.window.readFlush() f.step = (*sliceInflater).copyData return } @@ -270,9 +270,9 @@ func (f *sliceInflater) copyData() { f.pos += n f.roffset += int64(n) f.copyLen -= n - f.dict.writeMark(n) - if f.dict.availWrite() == 0 { - f.toRead = f.dict.readFlush() + f.window.writeMark(n) + if f.window.availWrite() == 0 { + f.toRead = f.window.readFlush() f.step = (*sliceInflater).copyData return } @@ -281,8 +281,8 @@ func (f *sliceInflater) copyData() { func (f *sliceInflater) finishBlock() { if f.final { - if f.dict.availRead() > 0 { - f.toRead = f.dict.readFlush() + if f.window.availRead() > 0 { + f.toRead = f.window.readFlush() } f.err = io.EOF } |
