diff options
Diffstat (limited to 'src/pkg/net/fd_darwin.go')
| -rw-r--r-- | src/pkg/net/fd_darwin.go | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/pkg/net/fd_darwin.go b/src/pkg/net/fd_darwin.go index 8de8ce300..8ae9f687c 100644 --- a/src/pkg/net/fd_darwin.go +++ b/src/pkg/net/fd_darwin.go @@ -12,27 +12,27 @@ import ( ) type pollster struct { - kq int; - eventbuf [10]syscall.Kevent_t; - events []syscall.Kevent_t; + kq int; + eventbuf [10]syscall.Kevent_t; + events []syscall.Kevent_t; } func newpollster() (p *pollster, err os.Error) { p = new(pollster); var e int; if p.kq, e = syscall.Kqueue(); e != 0 { - return nil, os.NewSyscallError("kqueue", e) + return nil, os.NewSyscallError("kqueue", e); } p.events = p.eventbuf[0:0]; - return p, nil + return p, nil; } func (p *pollster) AddFD(fd int, mode int, repeat bool) os.Error { var kmode int; if mode == 'r' { - kmode = syscall.EVFILT_READ + kmode = syscall.EVFILT_READ; } else { - kmode = syscall.EVFILT_WRITE + kmode = syscall.EVFILT_WRITE; } var events [1]syscall.Kevent_t; ev := &events[0]; @@ -42,7 +42,7 @@ func (p *pollster) AddFD(fd int, mode int, repeat bool) os.Error { // EV_ONESHOT - delete the event the first time it triggers flags := syscall.EV_ADD | syscall.EV_RECEIPT; if !repeat { - flags |= syscall.EV_ONESHOT + flags |= syscall.EV_ONESHOT; } syscall.SetKevent(ev, fd, kmode, flags); @@ -54,17 +54,17 @@ func (p *pollster) AddFD(fd int, mode int, repeat bool) os.Error { return os.ErrorString("kqueue phase error"); } if ev.Data != 0 { - return os.Errno(int(ev.Data)) + return os.Errno(int(ev.Data)); } - return nil + return nil; } func (p *pollster) DelFD(fd int, mode int) { var kmode int; if mode == 'r' { - kmode = syscall.EVFILT_READ + kmode = syscall.EVFILT_READ; } else { - kmode = syscall.EVFILT_WRITE + kmode = syscall.EVFILT_WRITE; } var events [1]syscall.Kevent_t; ev := &events[0]; @@ -87,26 +87,26 @@ func (p *pollster) WaitFD(nsec int64) (fd int, mode int, err os.Error) { nn, e := syscall.Kevent(p.kq, nil, &p.eventbuf, t); if e != 0 { if e == syscall.EINTR { - continue + continue; } - return -1, 0, os.NewSyscallError("kevent", e) + return -1, 0, os.NewSyscallError("kevent", e); } if nn == 0 { return -1, 0, nil; } - p.events = p.eventbuf[0:nn] + p.events = p.eventbuf[0:nn]; } ev := &p.events[0]; p.events = p.events[1:len(p.events)]; fd = int(ev.Ident); if ev.Filter == syscall.EVFILT_READ { - mode = 'r' + mode = 'r'; } else { - mode = 'w' + mode = 'w'; } - return fd, mode, nil + return fd, mode, nil; } func (p *pollster) Close() os.Error { - return os.NewSyscallError("close", syscall.Close(p.kq)) + return os.NewSyscallError("close", syscall.Close(p.kq)); } |
