net: fix some ineffectual assignments reported by ineffassign

Updates #35136

Change-Id: I5422a50dde51c0a57f135c83f4963053285a9bc2
GitHub-Last-Rev: 6db1a88da60fce3e4fd6697d5db75d55d53b2b49
GitHub-Pull-Request: golang/go#76704
Reviewed-on: https://go-review.googlesource.com/c/go/+/727080
Reviewed-by: Florian Lehner <lehner.florian86@gmail.com>
Reviewed-by: Carlos Amedee <carlos@golang.org>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Jorropo <jorropo.pgm@gmail.com>
Reviewed-by: Michael Pratt <mpratt@google.com>

diff --git a/src/net/dial_test.go b/src/net/dial_test.go
index 07a9b46ddb69ef450a8502c159d5418c2dad7cdb..7ddf8b9882c0e60442e397f67d022a0542c80e08 100644 (file)
--- a/src/net/dial_test.go
+++ b/src/net/dial_test.go
@@ -1088,14 +1088,16 @@ func TestDialContext(t *testing.T) {
                        var c Conn
                        switch network {
                        case "tcp", "tcp4", "tcp6":
-                               raddr, err := netip.ParseAddrPort(ln.Addr().String())
+                               var raddr netip.AddrPort
+                               raddr, err = netip.ParseAddrPort(ln.Addr().String())
                                if err != nil {
                                        t.Error(err)
                                        continue
                                }
                                c, err = d.DialTCP(context.WithValue(context.Background(), "id", i+1), network, (*TCPAddr)(nil).AddrPort(), raddr)
                        case "unix", "unixpacket":
-                               raddr, err := ResolveUnixAddr(network, ln.Addr().String())
+                               var raddr *UnixAddr
+                               raddr, err = ResolveUnixAddr(network, ln.Addr().String())
                                if err != nil {
                                        t.Error(err)
                                        continue
@@ -1131,14 +1133,16 @@ func TestDialContext(t *testing.T) {
                        var c2 Conn
                        switch network {
                        case "udp", "udp4", "udp6":
-                               raddr, err := netip.ParseAddrPort(c1.LocalAddr().String())
+                               var raddr netip.AddrPort
+                               raddr, err = netip.ParseAddrPort(c1.LocalAddr().String())
                                if err != nil {
                                        t.Error(err)
                                        continue
                                }
                                c2, err = d.DialUDP(context.WithValue(context.Background(), "id", i+1), network, (*UDPAddr)(nil).AddrPort(), raddr)
                        case "unixgram":
-                               raddr, err := ResolveUnixAddr(network, c1.LocalAddr().String())
+                               var raddr *UnixAddr
+                               raddr, err = ResolveUnixAddr(network, c1.LocalAddr().String())
                                if err != nil {
                                        t.Error(err)
                                        continue

diff --git a/src/net/dnsclient_unix.go b/src/net/dnsclient_unix.go
index 40f76062944f465fc05e7c2d690477565a261e5c..bf0456ba26cd1bbd5f601179cab3ccd29e583c18 100644 (file)
--- a/src/net/dnsclient_unix.go
+++ b/src/net/dnsclient_unix.go
@@ -495,9 +495,8 @@ func avoidDNS(name string) bool {
 // nameList returns a list of names for sequential DNS queries.
 func (conf *dnsConfig) nameList(name string) []string {
        // Check name length (see isDomainName).
-       l := len(name)
-       rooted := l > 0 && name[l-1] == '.'
-       if l > 254 || l == 254 && !rooted {
+       rooted := len(name) > 0 && name[len(name)-1] == '.'
+       if len(name) > 254 || len(name) == 254 && !rooted {
                return nil
        }
 
@@ -511,7 +510,6 @@ func (conf *dnsConfig) nameList(name string) []string {
 
        hasNdots := bytealg.CountString(name, '.') >= conf.ndots
        name += "."
-       l++
 
        // Build list of search choices.
        names := make([]string, 0, 1+len(conf.search))