diff options
| author | Russ Cox <rsc@golang.org> | 2009-04-30 13:49:58 -0700 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2009-04-30 13:49:58 -0700 |
| commit | 83e976d53ece4fb691ef0beec3198561851fca12 (patch) | |
| tree | 6cd40f650516610819632af04a2282303839550c /src/lib/net | |
| parent | bd8e25ca57ba8c6e506a00bee9d33934c646d5b2 (diff) | |
| download | go-83e976d53ece4fb691ef0beec3198561851fca12.tar.xz | |
bug146: array/slice conversion before I left missed conversions
R=ken
OCL=28120
CL=28124
Diffstat (limited to 'src/lib/net')
| -rw-r--r-- | src/lib/net/net_darwin.go | 4 | ||||
| -rw-r--r-- | src/lib/net/net_linux.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/net/net_darwin.go b/src/lib/net/net_darwin.go index 7e85f089b5..2419f6c6de 100644 --- a/src/lib/net/net_darwin.go +++ b/src/lib/net/net_darwin.go @@ -48,14 +48,14 @@ func sockaddrToIP(sa1 *syscall.Sockaddr) (p IP, port int, err os.Error) { switch sa1.Family { case syscall.AF_INET: sa := (*syscall.SockaddrInet4)(unsafe.Pointer(sa1)); - a := IP(sa.Addr).To16(); + a := IP(&sa.Addr).To16(); if a == nil { return nil, 0, os.EINVAL } return a, int(sa.Port[0])<<8 + int(sa.Port[1]), nil; case syscall.AF_INET6: sa := (*syscall.SockaddrInet6)(unsafe.Pointer(sa1)); - a := IP(sa.Addr).To16(); + a := IP(&sa.Addr).To16(); if a == nil { return nil, 0, os.EINVAL } diff --git a/src/lib/net/net_linux.go b/src/lib/net/net_linux.go index b6bfe7646c..9b55f67e6a 100644 --- a/src/lib/net/net_linux.go +++ b/src/lib/net/net_linux.go @@ -53,14 +53,14 @@ func sockaddrToIP(sa1 *syscall.Sockaddr) (p IP, port int, err os.Error) { switch sa1.Family { case syscall.AF_INET: sa := (*syscall.SockaddrInet4)(unsafe.Pointer(sa1)); - a := IP(sa.Addr).To16(); + a := IP(&sa.Addr).To16(); if a == nil { return nil, 0, os.EINVAL } return a, int(sa.Port[0])<<8 + int(sa.Port[1]), nil; case syscall.AF_INET6: sa := (*syscall.SockaddrInet6)(unsafe.Pointer(sa1)); - a := IP(sa.Addr).To16(); + a := IP(&sa.Addr).To16(); if a == nil { return nil, 0, os.EINVAL } |