net: simplify error return in *RawConn test helpers

No need to check operr before returning.

Change-Id: I64b849f7c102de01180823e3f0123d438ce7608a
Reviewed-on: https://go-review.googlesource.com/c/go/+/232797
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/net/rawconn_unix_test.go b/src/net/rawconn_unix_test.go
index a71b6f3041d7ea023f782a50c67aff153ec6874b..0194ba67c8ea852e464cc03de55c7c071293ba0e 100644 (file)
--- a/src/net/rawconn_unix_test.go
+++ b/src/net/rawconn_unix_test.go
@@ -24,10 +24,7 @@ func readRawConn(c syscall.RawConn, b []byte) (int, error) {
        if err != nil {
                return n, err
        }
-       if operr != nil {
-               return n, operr
-       }
-       return n, nil
+       return n, operr
 }
 
 func writeRawConn(c syscall.RawConn, b []byte) error {
@@ -42,10 +39,7 @@ func writeRawConn(c syscall.RawConn, b []byte) error {
        if err != nil {
                return err
        }
-       if operr != nil {
-               return operr
-       }
-       return nil
+       return operr
 }
 
 func controlRawConn(c syscall.RawConn, addr Addr) error {
@@ -87,10 +81,7 @@ func controlRawConn(c syscall.RawConn, addr Addr) error {
        if err := c.Control(fn); err != nil {
                return err
        }
-       if operr != nil {
-               return operr
-       }
-       return nil
+       return operr
 }
 
 func controlOnConnSetup(network string, address string, c syscall.RawConn) error {
@@ -120,8 +111,5 @@ func controlOnConnSetup(network string, address string, c syscall.RawConn) error
        if err := c.Control(fn); err != nil {
                return err
        }
-       if operr != nil {
-               return operr
-       }
-       return nil
+       return operr
 }

diff --git a/src/net/rawconn_windows_test.go b/src/net/rawconn_windows_test.go
index 2774c97e5c82e37937f8f23efab4ad9a2b76e780..5febf08f774b1892491ff8dbc0e80725021a1c0f 100644 (file)
--- a/src/net/rawconn_windows_test.go
+++ b/src/net/rawconn_windows_test.go
@@ -26,10 +26,7 @@ func readRawConn(c syscall.RawConn, b []byte) (int, error) {
        if err != nil {
                return n, err
        }
-       if operr != nil {
-               return n, operr
-       }
-       return n, nil
+       return n, operr
 }
 
 func writeRawConn(c syscall.RawConn, b []byte) error {
@@ -45,10 +42,7 @@ func writeRawConn(c syscall.RawConn, b []byte) error {
        if err != nil {
                return err
        }
-       if operr != nil {
-               return operr
-       }
-       return nil
+       return operr
 }
 
 func controlRawConn(c syscall.RawConn, addr Addr) error {
@@ -92,10 +86,7 @@ func controlRawConn(c syscall.RawConn, addr Addr) error {
        if err := c.Control(fn); err != nil {
                return err
        }
-       if operr != nil {
-               return operr
-       }
-       return nil
+       return operr
 }
 
 func controlOnConnSetup(network string, address string, c syscall.RawConn) error {
@@ -121,8 +112,5 @@ func controlOnConnSetup(network string, address string, c syscall.RawConn) error
        if err := c.Control(fn); err != nil {
                return err
        }
-       if operr != nil {
-               return operr
-       }
-       return nil
+       return operr
 }