diff options
| author | Russ Cox <rsc@golang.org> | 2008-12-19 03:05:37 -0800 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2008-12-19 03:05:37 -0800 |
| commit | 65e4c6bf1819903c1b751a3b305a6d2ec07cc283 (patch) | |
| tree | 183e8cd345f5f895d2cbc36dd8f8be93640303c3 /src/lib/net/fd_linux.go | |
| parent | 89995dcecf37b9a21c26783dcf8ab506da237363 (diff) | |
| download | golang-65e4c6bf1819903c1b751a3b305a6d2ec07cc283.tar.gz | |
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
Diffstat (limited to 'src/lib/net/fd_linux.go')
| -rw-r--r-- | src/lib/net/fd_linux.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/net/fd_linux.go b/src/lib/net/fd_linux.go index 282be20c4..e459dddc4 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) |