code review 5294074: src/pkg/[n-z]*: gofix -r error

src/pkg/net/fd_openbsd.go

 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 // Waiting for FDs via kqueue/kevent.
 
 package net
 
 import (
         "os"
         "syscall"
 )
 
 type pollster struct {
         kq       int
         eventbuf [10]syscall.Kevent_t
         events   []syscall.Kevent_t
 
         // An event buffer for AddFD/DelFD.
         // Must hold pollServer lock.
         kbuf [1]syscall.Kevent_t
 }
 
-func newpollster() (p *pollster, err os.Error) {
+func newpollster() (p *pollster, err error) {
         p = new(pollster)
         var e int
         if p.kq, e = syscall.Kqueue(); e != 0 {
                 return nil, os.NewSyscallError("kqueue", e)
         }
         p.events = p.eventbuf[0:0]
         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.
 
         var kmode int
         if mode == 'r' {
                 kmode = syscall.EVFILT_READ
         } else {
                 kmode = syscall.EVFILT_WRITE
         }
         ev := &p.kbuf[0]
         // EV_ADD - add event to kqueue list
@@ skipping 25 matching lines @@
                 kmode = syscall.EVFILT_READ
         } else {
                 kmode = syscall.EVFILT_WRITE
         }
         ev := &p.kbuf[0]
         // EV_DELETE - delete event from kqueue list
         syscall.SetKevent(ev, fd, kmode, syscall.EV_DELETE)
         syscall.Kevent(p.kq, p.kbuf[:], nil, nil)
 }
 
-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) {
         var t *syscall.Timespec
         for len(p.events) == 0 {
                 if nsec > 0 {
                         if t == nil {
                                 t = new(syscall.Timespec)
                         }
                         *t = syscall.NsecToTimespec(nsec)
                 }
 
                 s.Unlock()
@@ skipping 15 matching lines @@
         p.events = p.events[1:]
         fd = int(ev.Ident)
         if ev.Filter == syscall.EVFILT_READ {
                 mode = 'r'
         } else {
                 mode = 'w'
         }
         return fd, mode, nil
 }
 
-func (p *pollster) Close() os.Error { return os.NewSyscallError("close", syscall.Close(p.kq)) }
+func (p *pollster) Close() error { return os.NewSyscallError("close", syscall.Close(p.kq)) }