Skip to content

Commit b62df43

Browse files
committed
net: fix some ineffectual assignments reported by ineffassign
1 parent 9b2d39b commit b62df43

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
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
var c Conn
10901090
switch network {
10911091
case "tcp", "tcp4", "tcp6":
1092-
raddr, err := netip.ParseAddrPort(ln.Addr().String())
1092+
var raddr netip.AddrPort
1093+
raddr, err = netip.ParseAddrPort(ln.Addr().String())
10931094
if err != 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+
var raddr *UnixAddr
1101+
raddr, err = ResolveUnixAddr(network, ln.Addr().String())
11001102
if err != nil {
11011103
t.Error(err)
11021104
continue
@@ -1132,14 +1134,16 @@ func TestDialContext(t *testing.T) {
11321134
var c2 Conn
11331135
switch network {
11341136
case "udp", "udp4", "udp6":
1135-
raddr, err := netip.ParseAddrPort(c1.LocalAddr().String())
1137+
var raddr netip.AddrPort
1138+
raddr, err = netip.ParseAddrPort(c1.LocalAddr().String())
11361139
if err != 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+
var raddr *UnixAddr
1146+
raddr, err = ResolveUnixAddr(network, c1.LocalAddr().String())
11431147
if err != nil {
11441148
t.Error(err)
11451149
continue

src/net/dnsclient_unix.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,6 @@ func (conf *dnsConfig) nameList(name string) []string {
511511

512512
hasNdots := bytealg.CountString(name, '.') >= conf.ndots
513513
name += "."
514-
l++
515514

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

src/net/file_posix.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func newFileFD(f *os.File) (*netFD, error) {
1717
if err != nil {
1818
return nil, err
1919
}
20-
family := syscall.AF_UNSPEC
20+
var family int
2121
sotype, err := syscall.GetsockoptInt(s, syscall.SOL_SOCKET, _SO_TYPE)
2222
if err != nil {
2323
poll.CloseFunc(s)

0 commit comments

Comments
 (0)