diff options
| author | Russ Cox <rsc@golang.org> | 2008-12-19 03:05:37 -0800 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2008-12-19 03:05:37 -0800 |
| commit | 08ca30bbfad04d3ca1bf7ae75c291b91ecb00aef (patch) | |
| tree | 183e8cd345f5f895d2cbc36dd8f8be93640303c3 /src/lib/net/fd.go | |
| parent | d47d888ba663014e6aa8ca043e694f4b2a5898b8 (diff) | |
| download | go-08ca30bbfad04d3ca1bf7ae75c291b91ecb00aef.tar.xz | |
change *map to map; *chan to chan; new(T) to new(*T)
fix bugs left over from *[] to [] conversion.
TBR=r
OCL=21576
CL=21581
Diffstat (limited to 'src/lib/net/fd.go')
| -rw-r--r-- | src/lib/net/fd.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/net/fd.go b/src/lib/net/fd.go index 600ac38f65..a9c90c87cc 100644 --- a/src/lib/net/fd.go +++ b/src/lib/net/fd.go @@ -19,8 +19,8 @@ export type FD struct { // immutable until Close fd int64; osfd *os.FD; - cr *chan *FD; - cw *chan *FD; + cr chan *FD; + cw chan *FD; // owned by fd wait server ncr, ncw int; @@ -70,15 +70,15 @@ func SetNonblock(fd int64) *os.Error { // might help batch requests. type PollServer struct { - cr, cw *chan *FD; // buffered >= 1 + cr, cw chan *FD; // buffered >= 1 pr, pw *os.FD; - pending *map[int64] *FD; + pending map[int64] *FD; poll *Pollster; // low-level OS hooks } func (s *PollServer) Run(); func NewPollServer() (s *PollServer, err *os.Error) { - s = new(PollServer); + s = new(*PollServer); s.cr = new(chan *FD, 1); s.cw = new(chan *FD, 1); if s.pr, s.pw, err = os.Pipe(); err != nil { @@ -214,7 +214,7 @@ export func NewFD(fd int64) (f *FD, err *os.Error) { if err = SetNonblock(fd); err != nil { return nil, err } - f = new(FD); + f = new(*FD); f.fd = fd; f.osfd = os.NewFD(fd); f.cr = new(chan *FD, 1); |
