Merge pull request #3665 from pinglanlu/main

Zheaoli · web-flow · commit 966c25fd5359 · 2024-11-14T20:22:48.000+08:00
refactor: Use a more direct and less error-prone return value
diff --git a/pkg/netutil/subnet/subnet.go b/pkg/netutil/subnet/subnet.go
@@ -111,12 +111,12 @@ func LastIPInSubnet(addr *net.IPNet) (net.IP, error) {
 	}
 	ones, bits := cidr.Mask.Size()
 	if ones == bits {
-		return cidr.IP, err
+		return cidr.IP, nil
 	}
 	for i := range cidr.IP {
 		cidr.IP[i] = cidr.IP[i] | ^cidr.Mask[i]
 	}
-	return cidr.IP, err
+	return cidr.IP, nil
 }
 
 // firstIPInSubnet gets the first IP in a subnet
@@ -129,8 +129,8 @@ func FirstIPInSubnet(addr *net.IPNet) (net.IP, error) {
 	}
 	ones, bits := cidr.Mask.Size()
 	if ones == bits {
-		return cidr.IP, err
+		return cidr.IP, nil
 	}
 	cidr.IP[len(cidr.IP)-1]++
-	return cidr.IP, err
+	return cidr.IP, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -111,12 +111,12 @@ func LastIPInSubnet(addr *net.IPNet) (net.IP, error) {`
`111`	`111`	`}`
`112`	`112`	`ones, bits := cidr.Mask.Size()`
`113`	`113`	`if ones == bits {`
`114`		`- return cidr.IP, err`
	`114`	`+ return cidr.IP, nil`
`115`	`115`	`}`
`116`	`116`	`for i := range cidr.IP {`
`117`	`117`	`cidr.IP[i] = cidr.IP[i] \| ^cidr.Mask[i]`
`118`	`118`	`}`
`119`		`- return cidr.IP, err`
	`119`	`+ return cidr.IP, nil`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`// firstIPInSubnet gets the first IP in a subnet`
`@@ -129,8 +129,8 @@ func FirstIPInSubnet(addr *net.IPNet) (net.IP, error) {`
`129`	`129`	`}`
`130`	`130`	`ones, bits := cidr.Mask.Size()`
`131`	`131`	`if ones == bits {`
`132`		`- return cidr.IP, err`
	`132`	`+ return cidr.IP, nil`
`133`	`133`	`}`
`134`	`134`	`cidr.IP[len(cidr.IP)-1]++`
`135`		`- return cidr.IP, err`
	`135`	`+ return cidr.IP, nil`
`136`	`136`	`}`