aboutsummaryrefslogtreecommitdiff
path: root/internal
diff options
context:
space:
mode:
Diffstat (limited to 'internal')
-rw-r--r--internal/compress/flate/inflate.go13
-rw-r--r--internal/compress/zlib/reader.go19
-rw-r--r--internal/compress/zlib/reader_reset.go14
3 files changed, 0 insertions, 46 deletions
diff --git a/internal/compress/flate/inflate.go b/internal/compress/flate/inflate.go
index eeee6ab7..f12f1e77 100644
--- a/internal/compress/flate/inflate.go
+++ b/internal/compress/flate/inflate.go
@@ -288,14 +288,6 @@ type Reader interface {
io.ByteReader
}
-// InputProgress reports compressed input bytes consumed by inflate state.
-//
-// InputConsumed returns bytes that have been consumed by the decompressor's
-// parser and state machine, not bytes merely read ahead from the source.
-type InputProgress interface {
- InputConsumed() int64
-}
-
type step uint8
const (
@@ -354,11 +346,6 @@ type decompressor struct {
flushMode flushMode
}
-// InputConsumed returns compressed input bytes consumed by receiver.
-func (f *decompressor) InputConsumed() int64 {
- return f.roffset
-}
-
func (f *decompressor) nextBlock() {
for f.nb < 1+2 {
if f.err = f.moreBits(); f.err != nil {
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