From e88bd48f45c5939871141ae0e472ef4d36a86da6 Mon Sep 17 00:00:00 2001 From: Oleksandr Redko Date: Sun, 21 Apr 2024 20:57:04 +0300 Subject: refactor: do not return error as it is always nil (#1759) --- http.go | 44 ++++++++++++++++++-------------------------- server.go | 14 +++++++------- 2 files changed, 25 insertions(+), 33 deletions(-) diff --git a/http.go b/http.go index 1ae8c37..30a500d 100644 --- a/http.go +++ b/http.go @@ -1665,9 +1665,7 @@ func (resp *Response) WriteGzip(w *bufio.Writer) error { // // WriteGzipLevel doesn't flush response to w for performance reasons. func (resp *Response) WriteGzipLevel(w *bufio.Writer, level int) error { - if err := resp.gzipBody(level); err != nil { - return err - } + resp.gzipBody(level) return resp.Write(w) } @@ -1696,22 +1694,20 @@ func (resp *Response) WriteDeflate(w *bufio.Writer) error { // // WriteDeflateLevel doesn't flush response to w for performance reasons. func (resp *Response) WriteDeflateLevel(w *bufio.Writer, level int) error { - if err := resp.deflateBody(level); err != nil { - return err - } + resp.deflateBody(level) return resp.Write(w) } -func (resp *Response) brotliBody(level int) error { +func (resp *Response) brotliBody(level int) { if len(resp.Header.ContentEncoding()) > 0 { // It looks like the body is already compressed. // Do not compress it again. - return nil + return } if !resp.Header.isCompressibleContentType() { // The content-type cannot be compressed. - return nil + return } if resp.bodyStream != nil { @@ -1741,7 +1737,7 @@ func (resp *Response) brotliBody(level int) error { // There is no sense in spending CPU time on small body compression, // since there is a very high probability that the compressed // body size will be bigger than the original body size. - return nil + return } w := responseBodyPool.Get() w.B = AppendBrotliBytesLevel(w.B, bodyBytes, level) @@ -1755,19 +1751,18 @@ func (resp *Response) brotliBody(level int) error { } resp.Header.SetContentEncodingBytes(strBr) resp.Header.addVaryBytes(strAcceptEncoding) - return nil } -func (resp *Response) gzipBody(level int) error { +func (resp *Response) gzipBody(level int) { if len(resp.Header.ContentEncoding()) > 0 { // It looks like the body is already compressed. // Do not compress it again. - return nil + return } if !resp.Header.isCompressibleContentType() { // The content-type cannot be compressed. - return nil + return } if resp.bodyStream != nil { @@ -1797,7 +1792,7 @@ func (resp *Response) gzipBody(level int) error { // There is no sense in spending CPU time on small body compression, // since there is a very high probability that the compressed // body size will be bigger than the original body size. - return nil + return } w := responseBodyPool.Get() w.B = AppendGzipBytesLevel(w.B, bodyBytes, level) @@ -1811,19 +1806,18 @@ func (resp *Response) gzipBody(level int) error { } resp.Header.SetContentEncodingBytes(strGzip) resp.Header.addVaryBytes(strAcceptEncoding) - return nil } -func (resp *Response) deflateBody(level int) error { +func (resp *Response) deflateBody(level int) { if len(resp.Header.ContentEncoding()) > 0 { // It looks like the body is already compressed. // Do not compress it again. - return nil + return } if !resp.Header.isCompressibleContentType() { // The content-type cannot be compressed. - return nil + return } if resp.bodyStream != nil { @@ -1853,7 +1847,7 @@ func (resp *Response) deflateBody(level int) error { // There is no sense in spending CPU time on small body compression, // since there is a very high probability that the compressed // body size will be bigger than the original body size. - return nil + return } w := responseBodyPool.Get() w.B = AppendDeflateBytesLevel(w.B, bodyBytes, level) @@ -1867,16 +1861,15 @@ func (resp *Response) deflateBody(level int) error { } resp.Header.SetContentEncodingBytes(strDeflate) resp.Header.addVaryBytes(strAcceptEncoding) - return nil } -func (resp *Response) zstdBody(level int) error { +func (resp *Response) zstdBody(level int) { if len(resp.Header.ContentEncoding()) > 0 { - return nil + return } if !resp.Header.isCompressibleContentType() { - return nil + return } if resp.bodyStream != nil { @@ -1903,7 +1896,7 @@ func (resp *Response) zstdBody(level int) error { } else { bodyBytes := resp.bodyBytes() if len(bodyBytes) < minCompressLen { - return nil + return } w := responseBodyPool.Get() w.B = AppendZstdBytesLevel(w.B, bodyBytes, level) @@ -1916,7 +1909,6 @@ func (resp *Response) zstdBody(level int) error { } resp.Header.SetContentEncodingBytes(strZstd) resp.Header.addVaryBytes(strAcceptEncoding) - return nil } // Bodies with sizes smaller than minCompressLen aren't compressed at all. diff --git a/server.go b/server.go index e365b04..fe194a5 100644 --- a/server.go +++ b/server.go @@ -525,11 +525,11 @@ func CompressHandlerLevel(h RequestHandler, level int) RequestHandler { h(ctx) switch { case ctx.Request.Header.HasAcceptEncodingBytes(strGzip): - ctx.Response.gzipBody(level) //nolint:errcheck + ctx.Response.gzipBody(level) case ctx.Request.Header.HasAcceptEncodingBytes(strDeflate): - ctx.Response.deflateBody(level) //nolint:errcheck + ctx.Response.deflateBody(level) case ctx.Request.Header.HasAcceptEncodingBytes(strZstd): - ctx.Response.zstdBody(level) //nolint:errcheck + ctx.Response.zstdBody(level) } } } @@ -557,13 +557,13 @@ func CompressHandlerBrotliLevel(h RequestHandler, brotliLevel, otherLevel int) R h(ctx) switch { case ctx.Request.Header.HasAcceptEncodingBytes(strBr): - ctx.Response.brotliBody(brotliLevel) //nolint:errcheck + ctx.Response.brotliBody(brotliLevel) case ctx.Request.Header.HasAcceptEncodingBytes(strGzip): - ctx.Response.gzipBody(otherLevel) //nolint:errcheck + ctx.Response.gzipBody(otherLevel) case ctx.Request.Header.HasAcceptEncodingBytes(strDeflate): - ctx.Response.deflateBody(otherLevel) //nolint:errcheck + ctx.Response.deflateBody(otherLevel) case ctx.Request.Header.HasAcceptEncodingBytes(strZstd): - ctx.Response.zstdBody(otherLevel) //nolint:errcheck + ctx.Response.zstdBody(otherLevel) } } } -- cgit v1.2.3