fix_return_err_shadowing_by_nil

Signed-off-by: youngifif <[email protected]>
insomniacslk · Jun 3, 2024 · 6a8f9db · 6a8f9db
1 parent 51bc613
commit 6a8f9db
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/netboot/netconf.go b/netboot/netconf.go
@@ -192,7 +192,7 @@ func ConfigureInterface(ifname string, netconf *NetConf) (err error) {
 		return err
 	}
 	defer func() {
-		if cerr := rt.Close(); err != nil {
+		if cerr := rt.Close(); err == nil {
 			err = cerr
 		}
 	}()

diff --git a/netboot/netconf_integ_test.go b/netboot/netconf_integ_test.go
@@ -55,7 +55,7 @@ func TestConfigureInterface(t *testing.T) {
 			Name: "IP addr, DNS, and routers",
 			NetConf: &NetConf{
 				Addresses: []AddrConf{
-					AddrConf{IPNet: net.IPNet{IP: net.ParseIP("10.20.30.40")}},
+					AddrConf{IPNet: net.IPNet{IP: net.ParseIP("10.20.30.41")}},
 				},
 				DNSServers:    []net.IP{net.ParseIP("8.8.8.8")},
 				DNSSearchList: []string{"slackware.it"},