diff options
author | Ian Lance Taylor <ian@gcc.gnu.org> | 2015-10-31 00:59:47 +0000 |
---|---|---|
committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2015-10-31 00:59:47 +0000 |
commit | af146490bb04205107cb23e301ec7a8ff927b5fc (patch) | |
tree | 13beeaed3698c61903fe93fb1ce70bd9b18d4e7f /libgo/go/net/iprawsock.go | |
parent | 725e1be3406315d9bcc8195d7eef0a7082b3c7cc (diff) |
runtime: Remove now unnecessary pad field from ParFor.
It is not needed due to the removal of the ctx field.
Reviewed-on: https://go-review.googlesource.com/16525
From-SVN: r229616
Diffstat (limited to 'libgo/go/net/iprawsock.go')
-rw-r--r-- | libgo/go/net/iprawsock.go | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/libgo/go/net/iprawsock.go b/libgo/go/net/iprawsock.go index 5cc361390ff..f02df7fa8d1 100644 --- a/libgo/go/net/iprawsock.go +++ b/libgo/go/net/iprawsock.go @@ -17,13 +17,21 @@ func (a *IPAddr) String() string { if a == nil { return "<nil>" } + ip := ipEmptyString(a.IP) if a.Zone != "" { - return a.IP.String() + "%" + a.Zone + return ip + "%" + a.Zone } - return a.IP.String() + return ip } -func (a *IPAddr) toAddr() Addr { +func (a *IPAddr) isWildcard() bool { + if a == nil || a.IP == nil { + return true + } + return a.IP.IsUnspecified() +} + +func (a *IPAddr) opAddr() Addr { if a == nil { return nil } @@ -46,9 +54,9 @@ func ResolveIPAddr(net, addr string) (*IPAddr, error) { default: return nil, UnknownNetworkError(net) } - a, err := resolveInternetAddr(afnet, addr, noDeadline) + addrs, err := internetAddrList(afnet, addr, noDeadline) if err != nil { return nil, err } - return a.toAddr().(*IPAddr), nil + return addrs.first(isIPv4).(*IPAddr), nil } |