aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Oleksandr Redko <oleksandr.red+github@gmail.com> 2024-03-25 15:30:27 +0200
committerGravatar GitHub <noreply@github.com> 2024-03-25 14:30:27 +0100
commitbbc7bd04e2cb3747dad23b1c0a9e6ff22df5d449 (patch)
treeafc9fb1de869d4ea06938e36bd9571c69d02a1e2
parentUpdate deps (diff)
downloadfasthttp-bbc7bd04e2cb3747dad23b1c0a9e6ff22df5d449.tar.gz
fasthttp-bbc7bd04e2cb3747dad23b1c0a9e6ff22df5d449.tar.bz2
fasthttp-bbc7bd04e2cb3747dad23b1c0a9e6ff22df5d449.zip
refactor: rename error local variables (#1738)
-rw-r--r--fs.go24
-rw-r--r--http.go16
-rw-r--r--server.go4
3 files changed, 22 insertions, 22 deletions
diff --git a/fs.go b/fs.go
index 6793713..59638ad 100644
--- a/fs.go
+++ b/fs.go
@@ -1427,22 +1427,22 @@ func (h *fsHandler) compressFileNolock(
case "br":
zw := acquireStacklessBrotliWriter(zf, CompressDefaultCompression)
_, err = copyZeroAlloc(zw, f)
- if err1 := zw.Flush(); err == nil {
- err = err1
+ if errf := zw.Flush(); err == nil {
+ err = errf
}
releaseStacklessBrotliWriter(zw, CompressDefaultCompression)
case "gzip":
zw := acquireStacklessGzipWriter(zf, CompressDefaultCompression)
_, err = copyZeroAlloc(zw, f)
- if err1 := zw.Flush(); err == nil {
- err = err1
+ if errf := zw.Flush(); err == nil {
+ err = errf
}
releaseStacklessGzipWriter(zw, CompressDefaultCompression)
case "zstd":
zw := acquireStacklessZstdWriter(zf, CompressZstdDefault)
_, err = copyZeroAlloc(zw, f)
- if err1 := zw.Flush(); err == nil {
- err = err1
+ if errf := zw.Flush(); err == nil {
+ err = errf
}
releaseStacklessZstdWriter(zw, CompressZstdDefault)
}
@@ -1472,22 +1472,22 @@ func (h *fsHandler) newCompressedFSFileCache(f fs.File, fileInfo fs.FileInfo, fi
case "br":
zw := acquireStacklessBrotliWriter(w, CompressDefaultCompression)
_, err = copyZeroAlloc(zw, f)
- if err1 := zw.Flush(); err == nil {
- err = err1
+ if errf := zw.Flush(); err == nil {
+ err = errf
}
releaseStacklessBrotliWriter(zw, CompressDefaultCompression)
case "gzip":
zw := acquireStacklessGzipWriter(w, CompressDefaultCompression)
_, err = copyZeroAlloc(zw, f)
- if err1 := zw.Flush(); err == nil {
- err = err1
+ if errf := zw.Flush(); err == nil {
+ err = errf
}
releaseStacklessGzipWriter(zw, CompressDefaultCompression)
case "zstd":
zw := acquireStacklessZstdWriter(w, CompressZstdDefault)
_, err = copyZeroAlloc(zw, f)
- if err1 := zw.Flush(); err == nil {
- err = err1
+ if errf := zw.Flush(); err == nil {
+ err = errf
}
releaseStacklessZstdWriter(zw, CompressZstdDefault)
}
diff --git a/http.go b/http.go
index 5dd4e64..1ae8c37 100644
--- a/http.go
+++ b/http.go
@@ -1500,15 +1500,15 @@ func (resp *Response) WriteTo(w io.Writer) (int64, error) {
func writeBufio(hw httpWriter, w io.Writer) (int64, error) {
sw := acquireStatsWriter(w)
bw := acquireBufioWriter(sw)
- err1 := hw.Write(bw)
- err2 := bw.Flush()
+ errw := hw.Write(bw)
+ errf := bw.Flush()
releaseBufioWriter(bw)
n := sw.bytesWritten
releaseStatsWriter(sw)
- err := err1
+ err := errw
if err == nil {
- err = err2
+ err = errf
}
return n, err
}
@@ -2004,9 +2004,9 @@ func (req *Request) writeBodyStream(w *bufio.Writer) error {
err = req.Header.writeTrailer(w)
}
}
- err1 := req.closeBodyStream()
+ errc := req.closeBodyStream()
if err == nil {
- err = err1
+ err = errc
}
return err
}
@@ -2061,9 +2061,9 @@ func (resp *Response) writeBodyStream(w *bufio.Writer, sendBody bool) (err error
}
}
}
- err1 := resp.closeBodyStream()
+ errc := resp.closeBodyStream()
if err == nil {
- err = err1
+ err = errc
}
return err
}
diff --git a/server.go b/server.go
index 03b49f7..e365b04 100644
--- a/server.go
+++ b/server.go
@@ -2044,10 +2044,10 @@ func (s *Server) ServeConn(c net.Conn) error {
atomic.AddUint32(&s.concurrency, ^uint32(0))
if err != errHijacked {
- err1 := c.Close()
+ errc := c.Close()
s.setState(c, StateClosed)
if err == nil {
- err = err1
+ err = errc
}
} else {
err = nil