summaryrefslogtreecommitdiff
path: root/src/pkg/net/iprawsock.go
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2010-06-08 17:51:57 -0700
committerRuss Cox <rsc@golang.org>2010-06-08 17:51:57 -0700
commit11704e355aa8f39669a36fe56c01d17deab60658 (patch)
tree9650da2944370ff57a40bc0accdc6665dce42722 /src/pkg/net/iprawsock.go
parente577f85b2d2908bc727a91a7a5b9f79367f3d48c (diff)
downloadgolang-11704e355aa8f39669a36fe56c01d17deab60658.tar.gz
misc cleanup: gofmt + &x -> x[0:] conversion
R=gri CC=golang-dev http://codereview.appspot.com/1620042
Diffstat (limited to 'src/pkg/net/iprawsock.go')
-rw-r--r--src/pkg/net/iprawsock.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pkg/net/iprawsock.go b/src/pkg/net/iprawsock.go
index e7eee1a4b..bd8f8080a 100644
--- a/src/pkg/net/iprawsock.go
+++ b/src/pkg/net/iprawsock.go
@@ -15,9 +15,9 @@ import (
func sockaddrToIP(sa syscall.Sockaddr) Addr {
switch sa := sa.(type) {
case *syscall.SockaddrInet4:
- return &IPAddr{&sa.Addr}
+ return &IPAddr{sa.Addr[0:]}
case *syscall.SockaddrInet6:
- return &IPAddr{&sa.Addr}
+ return &IPAddr{sa.Addr[0:]}
}
return nil
}
@@ -176,14 +176,14 @@ func (c *IPConn) ReadFromIP(b []byte) (n int, addr *IPAddr, err os.Error) {
n, sa, err := c.fd.ReadFrom(b)
switch sa := sa.(type) {
case *syscall.SockaddrInet4:
- addr = &IPAddr{&sa.Addr}
+ addr = &IPAddr{sa.Addr[0:]}
if len(b) >= 4 { // discard ipv4 header
hsize := (int(b[0]) & 0xf) * 4
copy(b, b[hsize:])
n -= hsize
}
case *syscall.SockaddrInet6:
- addr = &IPAddr{&sa.Addr}
+ addr = &IPAddr{sa.Addr[0:]}
}
return
}