← Back to branch summary

~ubuntu-branches/ubuntu/vivid/golang/vivid

« back to all changes in this revision

Viewing changes to src/pkg/net/newpollserver.go

  • Committer: Bazaar Package Importer
  • Author(s): Ondřej Surý
  • Date: 2011-08-03 17:04:59 UTC
  • mfrom: (14.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20110803170459-wzd99m3567y80ila
Tags: 1:59-1
http://bugs.debian.org/634270
* Imported Upstream version 59
* Refresh patches to a new release
* Fix FTBFS on ARM (Closes: #634270)
* Update version.bash to work with Debian packaging and not hg
  repository

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/pkg/net/newpollserver.go
18
18
        }
19
19
        var e int
20
20
        if e = syscall.SetNonblock(s.pr.Fd(), true); e != 0 {
21
 
        Errno:
22
 
                err = &os.PathError{"setnonblock", s.pr.Name(), os.Errno(e)}
23
 
        Error:
24
 
                s.pr.Close()
25
 
                s.pw.Close()
26
 
                return nil, err
 
21
                goto Errno
27
22
        }
28
23
        if e = syscall.SetNonblock(s.pw.Fd(), true); e != 0 {
29
24
                goto Errno
38
33
        s.pending = make(map[int]*netFD)
39
34
        go s.Run()
40
35
        return s, nil
 
36
 
 
37
Errno:
 
38
        err = &os.PathError{"setnonblock", s.pr.Name(), os.Errno(e)}
 
39
Error:
 
40
        s.pr.Close()
 
41
        s.pw.Close()
 
42
        return nil, err
41
43
}