code review 5593046: net: replace error variable name e, errno with err

src/pkg/net/fd_linux.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 epoll(7).
 
 package net
 
 import (
         "os"
@@ skipping 116 matching lines @@
         for i < len(p.waitEvents) {
                 if fd == int(p.waitEvents[i].Fd) {
                         copy(p.waitEvents[i:], p.waitEvents[i+1:])
                         p.waitEvents = p.waitEvents[:len(p.waitEvents)-1]
                 } else {
                         i++
                 }
         }
 }
 
-func (p *pollster) WaitFD(s *pollServer, nsec int64) (int, int, error) {

[rsc, 2012/01/29 17:44:45]

Same.

[mikio, 2012/01/31 14:01:37]

Done.

+func (p *pollster) WaitFD(s *pollServer, nsec int64) (fd int, mode int, err error) {
         for len(p.waitEvents) == 0 {
                 var msec int = -1
                 if nsec > 0 {
                         msec = int((nsec + 1e6 - 1) / 1e6)
                 }
 
                 s.Unlock()
                 n, err := syscall.EpollWait(p.epfd, p.waitEventBuf[0:], msec)
                 s.Lock()
 
                 if err != nil {
                         if err == syscall.EAGAIN || err == syscall.EINTR {
                                 continue
                         }
                         return -1, 0, os.NewSyscallError("epoll_wait", err)
                 }
                 if n == 0 {
                         return -1, 0, nil
                 }
                 p.waitEvents = p.waitEventBuf[0:n]
         }
 
         ev := &p.waitEvents[0]
         p.waitEvents = p.waitEvents[1:]
 
-        fd := int(ev.Fd)
+        fd = int(ev.Fd)
 
         if ev.Events&writeFlags != 0 {
                 p.StopWaiting(fd, writeFlags)
                 return fd, 'w', nil
         }
         if ev.Events&readFlags != 0 {
                 p.StopWaiting(fd, readFlags)
                 return fd, 'r', nil
         }
 
         // Other events are error conditions - wake whoever is waiting.
         events, _ := p.events[fd]
         if events&writeFlags != 0 {
                 p.StopWaiting(fd, writeFlags)
                 return fd, 'w', nil
         }
         p.StopWaiting(fd, readFlags)
         return fd, 'r', nil
 }
 
 func (p *pollster) Close() error {
         return os.NewSyscallError("close", syscall.Close(p.epfd))
 }