type pollster struct {
readFds, writeFds, repeatFds *syscall.FdSet
- maxFd int
- readyReadFds, readyWriteFds *syscall.FdSet
- nReady int
- lastFd int
+ maxFd int
+ readyReadFds, readyWriteFds *syscall.FdSet
+ nReady int
+ lastFd int
}
-func newpollster() (p *pollster, err os.Error) {
+func newpollster() (p *pollster, err error) {
p = new(pollster)
p.readFds = new(syscall.FdSet)
p.writeFds = new(syscall.FdSet)
return p, nil
}
-func (p *pollster) AddFD(fd int, mode int, repeat bool) (bool, os.Error) {
+func (p *pollster) AddFD(fd int, mode int, repeat bool) (bool, error) {
// pollServer is locked.
if mode == 'r' {
// We don't worry about maxFd here.
}
-func (p *pollster) WaitFD(s *pollServer, nsec int64) (fd int, mode int, err os.Error) {
+func (p *pollster) WaitFD(s *pollServer, nsec int64) (fd int, mode int, err error) {
if p.nReady == 0 {
var timeout *syscall.Timeval
var tv syscall.Timeval
tmpWriteFds = *p.writeFds
s.Unlock()
- n, e = syscall.Select(p.maxFd + 1, &tmpReadFds, &tmpWriteFds, nil, timeout)
+ n, e = syscall.Select(p.maxFd+1, &tmpReadFds, &tmpWriteFds, nil, timeout)
s.Lock()
if e != syscall.EINTR {
}
flag := false
- for i := p.lastFd; i < p.maxFd + 1; i++ {
+ for i := p.lastFd; i < p.maxFd+1; i++ {
if syscall.FDIsSet(i, p.readyReadFds) {
flag = true
mode = 'r'
return -1, 0, nil
}
-func (p *pollster) Close() os.Error {
+func (p *pollster) Close() error {
return nil
}
import (
"fmt"
- "os"
"syscall"
)
-func unixSyslog() (conn serverConn, err os.Error) {
+func unixSyslog() (conn serverConn, err error) {
return libcConn(0), nil
}
func syslog_c(int, *byte)
-func (libcConn) writeBytes(p Priority, prefix string, b []byte) (int, os.Error) {
+func (libcConn) writeBytes(p Priority, prefix string, b []byte) (int, error) {
syslog_c(int(p), syscall.StringBytePtr(fmt.Sprintf("%s: %s", prefix, b)))
return len(b), nil
}
-func (libcConn) writeString(p Priority, prefix string, s string) (int, os.Error) {
+func (libcConn) writeString(p Priority, prefix string, s string) (int, error) {
syslog_c(int(p), syscall.StringBytePtr(fmt.Sprintf("%s: %s", prefix, s)))
return len(s), nil
}
-func (libcConn) close() os.Error {
+func (libcConn) close() error {
return nil
}