7 files changed, 17 insertions, 17 deletions
diff --git a/src/pkg/net/fd.go b/src/pkg/net/fd.go
index d7f2c9a5c..2f5930bcc 100644
--- a/src/pkg/net/fd.go
+++ b/src/pkg/net/fd.go
@@ -248,8 +248,8 @@ func (s *pollServer) Run() {
 		}
 		if fd == s.pr.Fd() {
 			// Drain our wakeup pipe.
-			for nn, _ := s.pr.Read(&scratch); nn > 0; {
-				nn, _ = s.pr.Read(&scratch)
+			for nn, _ := s.pr.Read(scratch[0:]); nn > 0; {
+				nn, _ = s.pr.Read(scratch[0:])
 			}
 			// Read from channels
 			for fd, ok := <-s.cr; ok; fd, ok = <-s.cr {
@@ -271,7 +271,7 @@ func (s *pollServer) Run() {
 
 var wakeupbuf [1]byte
 
-func (s *pollServer) Wakeup() { s.pw.Write(&wakeupbuf) }
+func (s *pollServer) Wakeup() { s.pw.Write(wakeupbuf[0:]) }
 
 func (s *pollServer) WaitRead(fd *netFD) {
 	s.cr <- fd
diff --git a/src/pkg/net/fd_darwin.go b/src/pkg/net/fd_darwin.go
index a33504f6e..cd0738753 100644
--- a/src/pkg/net/fd_darwin.go
+++ b/src/pkg/net/fd_darwin.go
@@ -46,7 +46,7 @@ func (p *pollster) AddFD(fd int, mode int, repeat bool) os.Error {
 	}
 	syscall.SetKevent(ev, fd, kmode, flags)
 
-	n, e := syscall.Kevent(p.kq, &events, &events, nil)
+	n, e := syscall.Kevent(p.kq, events[0:], events[0:], nil)
 	if e != 0 {
 		return os.NewSyscallError("kevent", e)
 	}
@@ -72,7 +72,7 @@ func (p *pollster) DelFD(fd int, mode int) {
 	// EV_RECEIPT - generate fake EV_ERROR as result of add,
 	//	rather than waiting for real event
 	syscall.SetKevent(ev, fd, kmode, syscall.EV_DELETE|syscall.EV_RECEIPT)
-	syscall.Kevent(p.kq, &events, &events, nil)
+	syscall.Kevent(p.kq, events[0:], events[0:], nil)
 }
 
 func (p *pollster) WaitFD(nsec int64) (fd int, mode int, err os.Error) {
@@ -84,7 +84,7 @@ func (p *pollster) WaitFD(nsec int64) (fd int, mode int, err os.Error) {
 			}
 			*t = syscall.NsecToTimespec(nsec)
 		}
-		nn, e := syscall.Kevent(p.kq, nil, &p.eventbuf, t)
+		nn, e := syscall.Kevent(p.kq, nil, p.eventbuf[0:], t)
 		if e != 0 {
 			if e == syscall.EINTR {
 				continue
diff --git a/src/pkg/net/fd_linux.go b/src/pkg/net/fd_linux.go
index 5024eec02..ef86cb17f 100644
--- a/src/pkg/net/fd_linux.go
+++ b/src/pkg/net/fd_linux.go
@@ -113,9 +113,9 @@ func (p *pollster) WaitFD(nsec int64) (fd int, mode int, err os.Error) {
 	if nsec > 0 {
 		msec = int((nsec + 1e6 - 1) / 1e6)
 	}
-	n, e := syscall.EpollWait(p.epfd, &evarray, msec)
+	n, e := syscall.EpollWait(p.epfd, evarray[0:], msec)
 	for e == syscall.EAGAIN || e == syscall.EINTR {
-		n, e = syscall.EpollWait(p.epfd, &evarray, msec)
+		n, e = syscall.EpollWait(p.epfd, evarray[0:], msec)
 	}
 	if e != 0 {
 		return -1, 0, os.NewSyscallError("epoll_wait", e)
diff --git a/src/pkg/net/ipsock.go b/src/pkg/net/ipsock.go
index e4b442e73..9477420d6 100644
--- a/src/pkg/net/ipsock.go
+++ b/src/pkg/net/ipsock.go
@@ -103,9 +103,9 @@ func getip(fd int, remote bool) (ip []byte, port int, ok bool) {
 	}
 	switch sa := sa.(type) {
 	case *syscall.SockaddrInet4:
-		return &sa.Addr, sa.Port, true
+		return sa.Addr[0:], sa.Port, true
 	case *syscall.SockaddrInet6:
-		return &sa.Addr, sa.Port, true
+		return sa.Addr[0:], sa.Port, true
 	}
 	return
 }
diff --git a/src/pkg/net/server_test.go b/src/pkg/net/server_test.go
index d6b3276ba..0d077fe95 100644
--- a/src/pkg/net/server_test.go
+++ b/src/pkg/net/server_test.go
@@ -23,7 +23,7 @@ func runEcho(fd io.ReadWriter, done chan<- int) {
 	var buf [1024]byte
 
 	for {
-		n, err := fd.Read(&buf)
+		n, err := fd.Read(buf[0:])
 		if err != nil || n == 0 {
 			break
 		}
@@ -74,7 +74,7 @@ func connect(t *testing.T, network, addr string, isEmpty bool) {
 		t.Fatalf("fd.Write(%q) = %d, %v", b, n, err1)
 	}
 
-	n, err1 = fd.Read(&b1)
+	n, err1 = fd.Read(b1[0:])
 	if n != len(b) || err1 != nil {
 		t.Fatalf("fd.Read() = %d, %v (want %d, nil)", n, err1, len(b))
 	}
@@ -126,7 +126,7 @@ func runPacket(t *testing.T, network, addr string, listening chan<- string, done
 	c.SetReadTimeout(10e6) // 10ms
 	var buf [1000]byte
 	for {
-		n, addr, err := c.ReadFrom(&buf)
+		n, addr, err := c.ReadFrom(buf[0:])
 		if e, ok := err.(Error); ok && e.Timeout() {
 			if done <- 1 {
 				break
diff --git a/src/pkg/net/sock.go b/src/pkg/net/sock.go
index be92095a6..fbdb69583 100644
--- a/src/pkg/net/sock.go
+++ b/src/pkg/net/sock.go
@@ -155,9 +155,9 @@ func (e *UnknownSocketError) String() string {
 func sockaddrToString(sa syscall.Sockaddr) (name string, err os.Error) {
 	switch a := sa.(type) {
 	case *syscall.SockaddrInet4:
-		return joinHostPort(IP(&a.Addr).String(), itoa(a.Port)), nil
+		return joinHostPort(IP(a.Addr[0:]).String(), itoa(a.Port)), nil
 	case *syscall.SockaddrInet6:
-		return joinHostPort(IP(&a.Addr).String(), itoa(a.Port)), nil
+		return joinHostPort(IP(a.Addr[0:]).String(), itoa(a.Port)), nil
 	case *syscall.SockaddrUnix:
 		return a.Name, nil
 	}
diff --git a/src/pkg/net/timeout_test.go b/src/pkg/net/timeout_test.go
index 9a7a2685e..3594c0a35 100644
--- a/src/pkg/net/timeout_test.go
+++ b/src/pkg/net/timeout_test.go
@@ -23,9 +23,9 @@ func testTimeout(t *testing.T, network, addr string, readFrom bool) {
 	var n int
 	var err1 os.Error
 	if readFrom {
-		n, _, err1 = fd.(PacketConn).ReadFrom(&b)
+		n, _, err1 = fd.(PacketConn).ReadFrom(b[0:])
 	} else {
-		n, err1 = fd.Read(&b)
+		n, err1 = fd.Read(b[0:])
 	}
 	t1 := time.Nanoseconds()
 	what := "Read"