diff options
| author | 2026-02-21 20:42:25 +0800 | |
|---|---|---|
| committer | 2026-02-21 20:42:25 +0800 | |
| commit | 970f5d2985a7a01e8edb9f3fe2bfc926ebb800e2 (patch) | |
| tree | 514a9fffc350b249a1e0930157514fa78220da9f /internal/zlib/writer.go | |
| parent | bufpool: Fix lints (diff) | |
| signature | No signature | |
internal/zlib: Fix lints
Diffstat (limited to 'internal/zlib/writer.go')
| -rw-r--r-- | internal/zlib/writer.go | 103 |
1 files changed, 53 insertions, 50 deletions
diff --git a/internal/zlib/writer.go b/internal/zlib/writer.go index bef53cd9..777a32d2 100644 --- a/internal/zlib/writer.go +++ b/internal/zlib/writer.go @@ -118,55 +118,6 @@ func (z *Writer) Reset(w io.Writer) { z.wroteHeader = false } -// writeHeader writes the ZLIB header. -func (z *Writer) writeHeader() (err error) { - z.wroteHeader = true - // ZLIB has a two-byte header (as documented in RFC 1950). - // The first four bits is the CINFO (compression info), which is 7 for the default deflate window size. - // The next four bits is the CM (compression method), which is 8 for deflate. - z.scratch[0] = 0x78 - // The next two bits is the FLEVEL (compression level). The four values are: - // 0=fastest, 1=fast, 2=default, 3=best. - // The next bit, FDICT, is set if a dictionary is given. - // The final five FCHECK bits form a mod-31 checksum. - switch z.level { - case -2, 0, 1: - z.scratch[1] = 0 << 6 - case 2, 3, 4, 5: - z.scratch[1] = 1 << 6 - case 6, -1: - z.scratch[1] = 2 << 6 - case 7, 8, 9: - z.scratch[1] = 3 << 6 - default: - panic("unreachable") - } - if z.dict != nil { - z.scratch[1] |= 1 << 5 - } - z.scratch[1] += uint8(31 - binary.BigEndian.Uint16(z.scratch[:2])%31) - if _, err = z.w.Write(z.scratch[0:2]); err != nil { - return err - } - if z.dict != nil { - // The next four bytes are the Adler-32 checksum of the dictionary. - binary.BigEndian.PutUint32(z.scratch[:], adler32.Checksum(z.dict)) - if _, err = z.w.Write(z.scratch[0:4]); err != nil { - return err - } - } - if z.compressor == nil { - // Initialize deflater unless the Writer is being reused - // after a Reset call. - z.compressor, err = flate.NewWriterDict(z.w, z.level, z.dict) - if err != nil { - return err - } - z.digest = adler32.New() - } - return nil -} - // Write writes a compressed form of p to the underlying [io.Writer]. The // compressed bytes are not necessarily flushed until the [Writer] is closed or // explicitly flushed. @@ -185,7 +136,10 @@ func (z *Writer) Write(p []byte) (n int, err error) { z.err = err return } - z.digest.Write(p) + if _, err = z.digest.Write(p); err != nil { + z.err = err + return 0, z.err + } return } @@ -225,3 +179,52 @@ func (z *Writer) Close() error { writerPool.Put(z) return nil } + +// writeHeader writes the ZLIB header. +func (z *Writer) writeHeader() (err error) { + z.wroteHeader = true + // ZLIB has a two-byte header (as documented in RFC 1950). + // The first four bits is the CINFO (compression info), which is 7 for the default deflate window size. + // The next four bits is the CM (compression method), which is 8 for deflate. + z.scratch[0] = 0x78 + // The next two bits is the FLEVEL (compression level). The four values are: + // 0=fastest, 1=fast, 2=default, 3=best. + // The next bit, FDICT, is set if a dictionary is given. + // The final five FCHECK bits form a mod-31 checksum. + switch z.level { + case -2, 0, 1: + z.scratch[1] = 0 << 6 + case 2, 3, 4, 5: + z.scratch[1] = 1 << 6 + case 6, -1: + z.scratch[1] = 2 << 6 + case 7, 8, 9: + z.scratch[1] = 3 << 6 + default: + panic("unreachable") + } + if z.dict != nil { + z.scratch[1] |= 1 << 5 + } + z.scratch[1] += uint8(31 - binary.BigEndian.Uint16(z.scratch[:2])%31) + if _, err = z.w.Write(z.scratch[0:2]); err != nil { + return err + } + if z.dict != nil { + // The next four bytes are the Adler-32 checksum of the dictionary. + binary.BigEndian.PutUint32(z.scratch[:], adler32.Checksum(z.dict)) + if _, err = z.w.Write(z.scratch[0:4]); err != nil { + return err + } + } + if z.compressor == nil { + // Initialize deflater unless the Writer is being reused + // after a Reset call. + z.compressor, err = flate.NewWriterDict(z.w, z.level, z.dict) + if err != nil { + return err + } + z.digest = adler32.New() + } + return nil +} |
