all: imp code

AdguardTeam · Aug 9, 2021 · a61b45d · a61b45d
1 parent f940890
commit a61b45d
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 36 deletions.
diff --git a/netutil/addr.go b/netutil/addr.go
@@ -175,12 +175,14 @@ func SplitHost(hostport string) (host string, err error) {
 // Any error returned will have the underlying type of *AddrError.
 func ValidateMAC(mac net.HardwareAddr) (err error) {
 	defer func() {
-		if err != nil {
-			err = &AddrError{
-				Err:  err,
-				Kind: KindMAC,
-				Addr: mac.String(),
-			}
+		if err == nil {
+			return
+		}
+
+		err = &AddrError{
+			Err:  err,
+			Kind: KindMAC,
+			Addr: mac.String(),
 		}
 	}()
 
@@ -214,12 +216,14 @@ const MaxDomainNameLen = 253
 // Any error returned will have the underlying type of *AddrError.
 func ValidateDomainNameLabel(label string) (err error) {
 	defer func() {
-		if err != nil {
-			err = &AddrError{
-				Err:  err,
-				Kind: KindLabel,
-				Addr: label,
-			}
+		if err == nil {
+			return
+		}
+
+		err = &AddrError{
+			Err:  err,
+			Kind: KindLabel,
+			Addr: label,
 		}
 	}()
 
@@ -270,12 +274,14 @@ func ValidateDomainNameLabel(label string) (err error) {
 // Any error returned will have the underlying type of *AddrError.
 func ValidateDomainName(name string) (err error) {
 	defer func() {
-		if err != nil {
-			err = &AddrError{
-				Err:  err,
-				Kind: KindName,
-				Addr: name,
-			}
+		if err == nil {
+			return
+		}
+
+		err = &AddrError{
+			Err:  err,
+			Kind: KindName,
+			Addr: name,
 		}
 	}()
 

diff --git a/netutil/hostport.go b/netutil/hostport.go
@@ -13,12 +13,14 @@ type HostPort struct {
 // underlying type of *AddrError.
 func ParseHostPort(addr string) (hp *HostPort, err error) {
 	defer func() {
-		if err != nil {
-			err = &AddrError{
-				Err:  err,
-				Kind: KindHostPort,
-				Addr: addr,
-			}
+		if err == nil {
+			return
+		}
+
+		err = &AddrError{
+			Err:  err,
+			Kind: KindHostPort,
+			Addr: addr,
 		}
 	}()
 

diff --git a/netutil/ipport.go b/netutil/ipport.go
@@ -29,12 +29,14 @@ func IPPortFromAddr(a net.Addr) (ipp *IPPort) {
 // underlying type of *AddrError.
 func ParseIPPort(addr string) (ipp *IPPort, err error) {
 	defer func() {
-		if err != nil {
-			err = &AddrError{
-				Err:  err,
-				Kind: KindIPPort,
-				Addr: addr,
-			}
+		if err == nil {
+			return
+		}
+
+		err = &AddrError{
+			Err:  err,
+			Kind: KindIPPort,
+			Addr: addr,
 		}
 	}()
 

diff --git a/netutil/reversed.go b/netutil/reversed.go
@@ -114,12 +114,14 @@ func IPFromReversedAddr(arpa string) (ip net.IP, err error) {
 	}
 
 	defer func() {
-		if err != nil {
-			err = &AddrError{
-				Err:  err,
-				Kind: KindARPA,
-				Addr: arpa,
-			}
+		if err == nil {
+			return
+		}
+
+		err = &AddrError{
+			Err:  err,
+			Kind: KindARPA,
+			Addr: arpa,
 		}
 	}()