lint: fix a few issues reported by revive

panjf2000 · Jan 4, 2025 · 7bfa4c5 · 7bfa4c5
1 parent 4ebe3fa
commit 7bfa4c5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/eventloop_unix.go b/eventloop_unix.go
@@ -238,11 +238,11 @@ func (el *eventloop) close(c *conn, err error) error {
 		if len(iov) > iovMax {
 			iov = iov[:iovMax]
 		}
-		if n, e := gio.Writev(c.fd, iov); e != nil {
+		n, err := gio.Writev(c.fd, iov)
+		if err != nil {
 			break
-		} else { //nolint:revive
-			_, _ = c.outboundBuffer.Discard(n)
 		}
+		_, _ = c.outboundBuffer.Discard(n)
 	}
 
 	c.release()

diff --git a/pkg/queue/lock_free_queue.go b/pkg/queue/lock_free_queue.go
@@ -165,6 +165,6 @@ func load(p *unsafe.Pointer) (n *node) {
 	return (*node)(atomic.LoadPointer(p))
 }
 
-func cas(p *unsafe.Pointer, old, new *node) bool {
-	return atomic.CompareAndSwapPointer(p, unsafe.Pointer(old), unsafe.Pointer(new))
+func cas(p *unsafe.Pointer, oldNode, newNode *node) bool {
+	return atomic.CompareAndSwapPointer(p, unsafe.Pointer(oldNode), unsafe.Pointer(newNode))
 }