extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2024-11-21 16:03:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

address updated golangci-lint errors: ineffectual assignment to err (ineffassign)

Browse Source
This commit is contained in:
Christian Schwarz 2023-09-10 10:48:22 +00:00
parent 9a434b0e54
commit 39f8ff62f0
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rpc/dataconn/timeoutconn/timeoutconn.go
View File

@ -107,34 +107,31 @@ func (c *Conn) RenewWriteDeadline() error {
return c.SetWriteDeadline(time.Now().Add(c.idleTimeout)) return c.SetWriteDeadline(time.Now().Add(c.idleTimeout))
} }
func (c *Conn) Read(p []byte) (n int, err error) { func (c *Conn) Read(p []byte) (n int, _ error) {
n = 0 n = 0
err = nil
restart: restart:
if err := c.renewReadDeadline(); err != nil { if err := c.renewReadDeadline(); err != nil {
return n, err return n, err
} }
var nCurRead int var nCurRead int
nCurRead, err = c.Wire.Read(p[n:]) nCurRead, err := c.Wire.Read(p[n:])
n += nCurRead n += nCurRead
if netErr, ok := err.(net.Error); ok && netErr.Timeout() && nCurRead > 0 { if netErr, ok := err.(net.Error); ok && netErr.Timeout() && nCurRead > 0 {
err = nil
goto restart goto restart
} }
return n, err return n, err
} }
func (c *Conn) Write(p []byte) (n int, err error) { func (c *Conn) Write(p []byte) (n int, _ error) {
n = 0 n = 0
restart: restart:
if err := c.RenewWriteDeadline(); err != nil { if err := c.RenewWriteDeadline(); err != nil {
return n, err return n, err
} }
var nCurWrite int var nCurWrite int
nCurWrite, err = c.Wire.Write(p[n:]) nCurWrite, err := c.Wire.Write(p[n:])
n += nCurWrite n += nCurWrite
if netErr, ok := err.(net.Error); ok && netErr.Timeout() && nCurWrite > 0 { if netErr, ok := err.(net.Error); ok && netErr.Timeout() && nCurWrite > 0 {
err = nil
goto restart goto restart
} }
return n, err return n, err
@ -144,17 +141,16 @@ restart:
// but is guaranteed to use the writev system call if the wrapped Wire // but is guaranteed to use the writev system call if the wrapped Wire
// support it. // support it.
// Note the Conn does not support writev through io.Copy(aConn, aNetBuffers). // Note the Conn does not support writev through io.Copy(aConn, aNetBuffers).
func (c *Conn) WritevFull(bufs net.Buffers) (n int64, err error) { func (c *Conn) WritevFull(bufs net.Buffers) (n int64, _ error) {
n = 0 n = 0
restart: restart:
if err := c.RenewWriteDeadline(); err != nil { if err := c.RenewWriteDeadline(); err != nil {
return n, err return n, err
} }
var nCurWrite int64 var nCurWrite int64
nCurWrite, err = io.Copy(c.Wire, &bufs) nCurWrite, err := io.Copy(c.Wire, &bufs)
n += nCurWrite n += nCurWrite
if netErr, ok := err.(net.Error); ok && netErr.Timeout() && nCurWrite > 0 { if netErr, ok := err.(net.Error); ok && netErr.Timeout() && nCurWrite > 0 {
err = nil
goto restart goto restart
} }
return n, err return n, err