qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 03:17:58 -07:00
Code Releases Activity

net: Return error from CloseRead and CloseWrite.

Browse Source 
R=bradfitz, rsc, iant
CC=golang-dev
https://golang.org/cl/5167043
This commit is contained in:
Albert Strasheim 2011-10-12 13:45:25 -04:00 committed by Russ Cox
parent 51057bda3f
commit 791b2a498e
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/pkg/net/fd.go
View File

@ -358,20 +358,23 @@ func (fd *netFD) Close() os.Error {
return nil return nil
} }
func (fd *netFD) CloseRead() os.Error { func (fd *netFD) shutdown(how int) os.Error {
if fd == nil || fd.sysfile == nil { if fd == nil || fd.sysfile == nil {
return os.EINVAL return os.EINVAL
} }
syscall.Shutdown(fd.sysfd, syscall.SHUT_RD) errno := syscall.Shutdown(fd.sysfd, how)
if errno != 0 {
return &OpError{"shutdown", fd.net, fd.laddr, os.Errno(errno)}
}
return nil return nil
} }
func (fd *netFD) CloseRead() os.Error {
return fd.shutdown(syscall.SHUT_RD)
}
func (fd *netFD) CloseWrite() os.Error { func (fd *netFD) CloseWrite() os.Error {
if fd == nil || fd.sysfile == nil { return fd.shutdown(syscall.SHUT_WR)
return os.EINVAL
}
syscall.Shutdown(fd.sysfd, syscall.SHUT_WR)
return nil
} }
func (fd *netFD) Read(p []byte) (n int, err os.Error) { func (fd *netFD) Read(p []byte) (n int, err os.Error) {

17
src/pkg/net/fd_windows.go
View File

@ -312,20 +312,23 @@ func (fd *netFD) Close() os.Error {
return nil return nil
} }
func (fd *netFD) CloseRead() os.Error { func (fd *netFD) shutdown(how int) os.Error {
if fd == nil || fd.sysfd == syscall.InvalidHandle { if fd == nil || fd.sysfd == syscall.InvalidHandle {
return os.EINVAL return os.EINVAL
} }
syscall.Shutdown(fd.sysfd, syscall.SHUT_RD) errno := syscall.Shutdown(fd.sysfd, how)
if errno != 0 {
return &OpError{"shutdown", fd.net, fd.laddr, os.Errno(errno)}
}
return nil return nil
} }
func (fd *netFD) CloseRead() os.Error {
return fd.shutdown(syscall.SHUT_RD)
}
func (fd *netFD) CloseWrite() os.Error { func (fd *netFD) CloseWrite() os.Error {
if fd == nil || fd.sysfd == syscall.InvalidHandle { return fd.shutdown(syscall.SHUT_WR)
return os.EINVAL
}
syscall.Shutdown(fd.sysfd, syscall.SHUT_WR)
return nil
} }
// Read from network. // Read from network.