Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
/goPublic

Commitdc13df6

Browse files
committed
net: fix some ineffectual assignments reported by ineffassign
1 parent9b2d39b commitdc13df6

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

‎src/net/dial_test.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,14 +1089,16 @@ func TestDialContext(t *testing.T) {
10891089
varcConn
10901090
switchnetwork {
10911091
case"tcp","tcp4","tcp6":
1092-
raddr,err:=netip.ParseAddrPort(ln.Addr().String())
1092+
varraddr netip.AddrPort
1093+
raddr,err=netip.ParseAddrPort(ln.Addr().String())
10931094
iferr!=nil {
10941095
t.Error(err)
10951096
continue
10961097
}
10971098
c,err=d.DialTCP(context.WithValue(context.Background(),"id",i+1),network, (*TCPAddr)(nil).AddrPort(),raddr)
10981099
case"unix","unixpacket":
1099-
raddr,err:=ResolveUnixAddr(network,ln.Addr().String())
1100+
varraddr*UnixAddr
1101+
raddr,err=ResolveUnixAddr(network,ln.Addr().String())
11001102
iferr!=nil {
11011103
t.Error(err)
11021104
continue
@@ -1132,14 +1134,16 @@ func TestDialContext(t *testing.T) {
11321134
varc2Conn
11331135
switchnetwork {
11341136
case"udp","udp4","udp6":
1135-
raddr,err:=netip.ParseAddrPort(c1.LocalAddr().String())
1137+
varraddr netip.AddrPort
1138+
raddr,err=netip.ParseAddrPort(c1.LocalAddr().String())
11361139
iferr!=nil {
11371140
t.Error(err)
11381141
continue
11391142
}
11401143
c2,err=d.DialUDP(context.WithValue(context.Background(),"id",i+1),network, (*UDPAddr)(nil).AddrPort(),raddr)
11411144
case"unixgram":
1142-
raddr,err:=ResolveUnixAddr(network,c1.LocalAddr().String())
1145+
varraddr*UnixAddr
1146+
raddr,err=ResolveUnixAddr(network,c1.LocalAddr().String())
11431147
iferr!=nil {
11441148
t.Error(err)
11451149
continue

‎src/net/dnsclient_unix.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -495,9 +495,8 @@ func avoidDNS(name string) bool {
495495
// nameList returns a list of names for sequential DNS queries.
496496
func (conf*dnsConfig)nameList(namestring) []string {
497497
// Check name length (see isDomainName).
498-
l:=len(name)
499-
rooted:=l>0&&name[l-1]=='.'
500-
ifl>254||l==254&&!rooted {
498+
rooted:=len(name)>0&&name[len(name)-1]=='.'
499+
iflen(name)>254||len(name)==254&&!rooted {
501500
returnnil
502501
}
503502

@@ -511,7 +510,6 @@ func (conf *dnsConfig) nameList(name string) []string {
511510

512511
hasNdots:=bytealg.CountString(name,'.')>=conf.ndots
513512
name+="."
514-
l++
515513

516514
// Build list of search choices.
517515
names:=make([]string,0,1+len(conf.search))

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp