move unix.EINPROGRESS condition to err nil block

panjf2000 · May 23, 2022 · 4331027 · 4331027
1 parent 483cff9
commit 4331027
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/internal/socket/tcp_socket.go b/internal/socket/tcp_socket.go
@@ -124,10 +124,10 @@ func tcpSocket(proto, addr string, passive bool, sockOpts ...Option) (fd int, ne
 	}
 	defer func() {
 		// ignore EINPROGRESS for non-blocking socket connect, should be processed by caller
-		if t, ok := err.(*os.SyscallError); ok && t.Err == unix.EINPROGRESS {
-			return
-		}
 		if err != nil {
+			if err, ok := err.(*os.SyscallError); ok && err.Err == unix.EINPROGRESS {
+				return
+			}
 			_ = unix.Close(fd)
 		}
 	}()

diff --git a/internal/socket/udp_socket.go b/internal/socket/udp_socket.go
@@ -122,10 +122,10 @@ func udpSocket(proto, addr string, connect bool, sockOpts ...Option) (fd int, ne
 	}
 	defer func() {
 		// ignore EINPROGRESS for non-blocking socket connect, should be processed by caller
-		if t, ok := err.(*os.SyscallError); ok && t.Err == unix.EINPROGRESS {
-			return
-		}
 		if err != nil {
+			if err, ok := err.(*os.SyscallError); ok && err.Err == unix.EINPROGRESS {
+				return
+			}
 			_ = unix.Close(fd)
 		}
 	}()

diff --git a/internal/socket/unix_socket.go b/internal/socket/unix_socket.go
@@ -62,10 +62,10 @@ func udsSocket(proto, addr string, passive bool, sockOpts ...Option) (fd int, ne
 	defer func() {
 		// ignore EINPROGRESS for non-blocking socket connect, should be processed by caller
 		// though there is less situation for EINPROGRESS when using unix socket
-		if t, ok := err.(*os.SyscallError); ok && t.Err == unix.EINPROGRESS {
-			return
-		}
 		if err != nil {
+			if err, ok := err.(*os.SyscallError); ok && err.Err == unix.EINPROGRESS {
+				return
+			}
 			_ = unix.Close(fd)
 		}
 	}()