diff options
| author | Russ Cox <rsc@golang.org> | 2010-06-18 22:45:42 -0700 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2010-06-18 22:45:42 -0700 |
| commit | f26c28a219d496036138048fac8ba7aa9f5745cc (patch) | |
| tree | f3f273a21e2d2a9cf523e6fc7323bfc7f4ba20b0 | |
| parent | 97ef9c82c285b9079381a57c419396afd76375ae (diff) | |
| download | golang-f26c28a219d496036138048fac8ba7aa9f5745cc.tar.gz | |
nacl: fix build
TBR=r
CC=golang-dev
http://codereview.appspot.com/1706044
| -rw-r--r-- | src/pkg/exp/nacl/av/av.go | 2 | ||||
| -rw-r--r-- | src/pkg/exp/nacl/srpc/msg.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/pkg/exp/nacl/av/av.go b/src/pkg/exp/nacl/av/av.go index 0ed275760..5c8728292 100644 --- a/src/pkg/exp/nacl/av/av.go +++ b/src/pkg/exp/nacl/av/av.go @@ -157,7 +157,7 @@ func videoPollEvent(ev []byte) (err os.Error) { if r == bridge.share.eq.wi { return noEvents } - copy(ev, &bridge.share.eq.event[r]) + copy(ev, bridge.share.eq.event[r][0:]) bridge.share.eq.ri = (r + 1) % eqsize return nil } diff --git a/src/pkg/exp/nacl/srpc/msg.go b/src/pkg/exp/nacl/srpc/msg.go index b08327ca6..fe36dbdeb 100644 --- a/src/pkg/exp/nacl/srpc/msg.go +++ b/src/pkg/exp/nacl/srpc/msg.go @@ -120,7 +120,7 @@ func (r *msgReceiver) recv() (*msg, os.Error) { // returned the total byte count as n. m := new(msg) m.rdata = make([]byte, n) - copy(m.rdata, &r.data) + copy(m.rdata, r.data[0:]) // Make a copy of the desc too. // The system call *did* update r.hdr.ndesc. |