diff options
| author | 2026-03-08 02:30:36 +0800 | |
|---|---|---|
| committer | 2026-03-08 02:30:36 +0800 | |
| commit | 5b7b35ea3ad3901a495ff378b6bfdd7d64f2ed67 (patch) | |
| tree | 02c099e6097cf63bfdd6444d08f6d8cbf39d4999 /internal/compress/zlib | |
| parent | protocol/v0v1/server/receivepack: Nolint nestif here (diff) | |
| signature | No signature | |
internal/compress: Remove InputConsumed/Progress
Diffstat (limited to 'internal/compress/zlib')
| -rw-r--r-- | internal/compress/zlib/reader.go | 19 | ||||
| -rw-r--r-- | internal/compress/zlib/reader_reset.go | 14 |
2 files changed, 0 insertions, 33 deletions
diff --git a/internal/compress/zlib/reader.go b/internal/compress/zlib/reader.go index 1f6d4337..78df4f56 100644 --- a/internal/compress/zlib/reader.go +++ b/internal/compress/zlib/reader.go @@ -73,7 +73,6 @@ var readerPool = sync.Pool{ type Reader struct { r flate.Reader decompressor io.ReadCloser - progress flate.InputProgress digest hash.Hash32 headerRead uint64 trailerRead uint64 @@ -163,24 +162,6 @@ func (z *Reader) Read(p []byte) (int, error) { return n, io.EOF } -// InputConsumed returns compressed bytes consumed from stream input. -// -// This count includes the zlib header, deflate payload, and zlib checksum -// trailer bytes read by the reader. -func (z *Reader) InputConsumed() uint64 { - out := z.headerRead + z.trailerRead - if z.progress != nil { - progressIn, err := intconv.Int64ToUint64(z.progress.InputConsumed()) - if err != nil { - panic(err) - } - - out += progressIn - } - - return out -} - // Close does not close the wrapped [io.Reader] originally passed to [NewReader]. // In order for the ZLIB checksum to be verified, the reader must be // fully consumed until the [io.EOF]. diff --git a/internal/compress/zlib/reader_reset.go b/internal/compress/zlib/reader_reset.go index fe675c73..0d531896 100644 --- a/internal/compress/zlib/reader_reset.go +++ b/internal/compress/zlib/reader_reset.go @@ -95,13 +95,6 @@ func (z *Reader) reset(r io.Reader, dict []byte) error { return z.err } - progress, ok := z.decompressor.(flate.InputProgress) - if !ok { - panic("zlib: pooled decompressor does not implement flate.InputProgress") - } - - z.progress = progress - z.digest = adler32.New() return nil @@ -113,13 +106,6 @@ func (z *Reader) reset(r io.Reader, dict []byte) error { z.decompressor = flate.NewReader(z.r) } - progress, ok := z.decompressor.(flate.InputProgress) - if !ok { - panic("zlib: decompressor does not implement flate.InputProgress") - } - - z.progress = progress - z.digest = adler32.New() return nil |
