gsrlabs/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2026-01-29 07:02:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

net: fix some ineffectual assignments reported by ineffassign

Browse Source 
Updates #35136

Change-Id: I5422a50dde51c0a57f135c83f4963053285a9bc2
GitHub-Last-Rev: 6db1a88da6
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>
This commit is contained in:
Lin Lin
2025-12-06 01:35:22 +00:00
committed by Jorropo
parent ca5ffe0092
commit 3443ae0863
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/net/dial_test.go
View File

@@ -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

6
src/net/dnsclient_unix.go
View File

@@ -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))