From 08ca30bbfad04d3ca1bf7ae75c291b91ecb00aef Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Fri, 19 Dec 2008 03:05:37 -0800 Subject: change *map to map; *chan to chan; new(T) to new(*T) fix bugs left over from *[] to [] conversion. TBR=r OCL=21576 CL=21581 --- src/lib/net/fd_linux.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/lib/net/fd_linux.go') diff --git a/src/lib/net/fd_linux.go b/src/lib/net/fd_linux.go index 282be20c47..e459dddc4a 100644 --- a/src/lib/net/fd_linux.go +++ b/src/lib/net/fd_linux.go @@ -21,11 +21,11 @@ export type Pollster struct { epfd int64; // Events we're already waiting for - events *map[int64] uint32; + events map[int64] uint32; } export func NewPollster() (p *Pollster, err *os.Error) { - p = new(Pollster); + p = new(*Pollster); var e int64; // The arg to epoll_create is a hint to the kernel @@ -102,9 +102,9 @@ func (p *Pollster) WaitFD() (fd int64, mode int, err *os.Error) { // Get an event. var evarray [1]syscall.EpollEvent; ev := &evarray[0]; - n, e := syscall.epoll_wait(p.epfd, &evarray, -1); + n, e := syscall.epoll_wait(p.epfd, evarray, -1); for e == syscall.EAGAIN || e == syscall.EINTR { - n, e = syscall.epoll_wait(p.epfd, &evarray, -1) + n, e = syscall.epoll_wait(p.epfd, evarray, -1) } if e != 0 { return -1, 0, os.ErrnoToError(e) -- cgit v1.3