Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(1314)

Unified Diff: src/pkg/os/error_posix.go

Issue 5298073: code review 5298073: os: use error, io.EOF (Closed)
Patch Set: diff -r f751618f828b https://go.googlecode.com/hg/ Created 13 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/pkg/os/error_plan9.go ('k') | src/pkg/os/exec_plan9.go » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/pkg/os/error_posix.go
===================================================================
--- a/src/pkg/os/error_posix.go
+++ b/src/pkg/os/error_posix.go
@@ -9,10 +9,10 @@
import syscall "syscall"
// Errno is the Unix error number. Names such as EINVAL are simple
-// wrappers to convert the error number into an Error.
+// wrappers to convert the error number into an error.
type Errno int64
-func (e Errno) String() string { return syscall.Errstr(int(e)) }
+func (e Errno) Error() string { return syscall.Errstr(int(e)) }
func (e Errno) Temporary() bool {
return e == Errno(syscall.EINTR) || e == Errno(syscall.EMFILE) || e.Timeout()
@@ -24,45 +24,45 @@
// Commonly known Unix errors.
var (
- EPERM Error = Errno(syscall.EPERM)
- ENOENT Error = Errno(syscall.ENOENT)
- ESRCH Error = Errno(syscall.ESRCH)
- EINTR Error = Errno(syscall.EINTR)
- EIO Error = Errno(syscall.EIO)
- ENXIO Error = Errno(syscall.ENXIO)
- E2BIG Error = Errno(syscall.E2BIG)
- ENOEXEC Error = Errno(syscall.ENOEXEC)
- EBADF Error = Errno(syscall.EBADF)
- ECHILD Error = Errno(syscall.ECHILD)
- EDEADLK Error = Errno(syscall.EDEADLK)
- ENOMEM Error = Errno(syscall.ENOMEM)
- EACCES Error = Errno(syscall.EACCES)
- EFAULT Error = Errno(syscall.EFAULT)
- EBUSY Error = Errno(syscall.EBUSY)
- EEXIST Error = Errno(syscall.EEXIST)
- EXDEV Error = Errno(syscall.EXDEV)
- ENODEV Error = Errno(syscall.ENODEV)
- ENOTDIR Error = Errno(syscall.ENOTDIR)
- EISDIR Error = Errno(syscall.EISDIR)
- EINVAL Error = Errno(syscall.EINVAL)
- ENFILE Error = Errno(syscall.ENFILE)
- EMFILE Error = Errno(syscall.EMFILE)
- ENOTTY Error = Errno(syscall.ENOTTY)
- EFBIG Error = Errno(syscall.EFBIG)
- ENOSPC Error = Errno(syscall.ENOSPC)
- ESPIPE Error = Errno(syscall.ESPIPE)
- EROFS Error = Errno(syscall.EROFS)
- EMLINK Error = Errno(syscall.EMLINK)
- EPIPE Error = Errno(syscall.EPIPE)
- EAGAIN Error = Errno(syscall.EAGAIN)
- EDOM Error = Errno(syscall.EDOM)
- ERANGE Error = Errno(syscall.ERANGE)
- EADDRINUSE Error = Errno(syscall.EADDRINUSE)
- ECONNREFUSED Error = Errno(syscall.ECONNREFUSED)
- ENAMETOOLONG Error = Errno(syscall.ENAMETOOLONG)
- EAFNOSUPPORT Error = Errno(syscall.EAFNOSUPPORT)
- ETIMEDOUT Error = Errno(syscall.ETIMEDOUT)
- ENOTCONN Error = Errno(syscall.ENOTCONN)
+ EPERM error = Errno(syscall.EPERM)
+ ENOENT error = Errno(syscall.ENOENT)
+ ESRCH error = Errno(syscall.ESRCH)
+ EINTR error = Errno(syscall.EINTR)
+ EIO error = Errno(syscall.EIO)
+ ENXIO error = Errno(syscall.ENXIO)
+ E2BIG error = Errno(syscall.E2BIG)
+ ENOEXEC error = Errno(syscall.ENOEXEC)
+ EBADF error = Errno(syscall.EBADF)
+ ECHILD error = Errno(syscall.ECHILD)
+ EDEADLK error = Errno(syscall.EDEADLK)
+ ENOMEM error = Errno(syscall.ENOMEM)
+ EACCES error = Errno(syscall.EACCES)
+ EFAULT error = Errno(syscall.EFAULT)
+ EBUSY error = Errno(syscall.EBUSY)
+ EEXIST error = Errno(syscall.EEXIST)
+ EXDEV error = Errno(syscall.EXDEV)
+ ENODEV error = Errno(syscall.ENODEV)
+ ENOTDIR error = Errno(syscall.ENOTDIR)
+ EISDIR error = Errno(syscall.EISDIR)
+ EINVAL error = Errno(syscall.EINVAL)
+ ENFILE error = Errno(syscall.ENFILE)
+ EMFILE error = Errno(syscall.EMFILE)
+ ENOTTY error = Errno(syscall.ENOTTY)
+ EFBIG error = Errno(syscall.EFBIG)
+ ENOSPC error = Errno(syscall.ENOSPC)
+ ESPIPE error = Errno(syscall.ESPIPE)
+ EROFS error = Errno(syscall.EROFS)
+ EMLINK error = Errno(syscall.EMLINK)
+ EPIPE error = Errno(syscall.EPIPE)
+ EAGAIN error = Errno(syscall.EAGAIN)
+ EDOM error = Errno(syscall.EDOM)
+ ERANGE error = Errno(syscall.ERANGE)
+ EADDRINUSE error = Errno(syscall.EADDRINUSE)
+ ECONNREFUSED error = Errno(syscall.ECONNREFUSED)
+ ENAMETOOLONG error = Errno(syscall.ENAMETOOLONG)
+ EAFNOSUPPORT error = Errno(syscall.EAFNOSUPPORT)
+ ETIMEDOUT error = Errno(syscall.ETIMEDOUT)
+ ENOTCONN error = Errno(syscall.ENOTCONN)
)
// SyscallError records an error from a specific system call.
@@ -71,16 +71,16 @@
Errno Errno
}
-func (e *SyscallError) String() string { return e.Syscall + ": " + e.Errno.String() }
+func (e *SyscallError) Error() string { return e.Syscall + ": " + e.Errno.Error() }
// Note: If the name of the function NewSyscallError changes,
// pkg/go/doc/doc.go should be adjusted since it hardwires
// this name in a heuristic.
-// NewSyscallError returns, as an Error, a new SyscallError
+// NewSyscallError returns, as an error, a new SyscallError
// with the given system call name and error details.
// As a convenience, if errno is 0, NewSyscallError returns nil.
-func NewSyscallError(syscall string, errno int) Error {
+func NewSyscallError(syscall string, errno int) error {
if errno == 0 {
return nil
}
« no previous file with comments | « src/pkg/os/error_plan9.go ('k') | src/pkg/os/exec_plan9.go » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b