code review 5651084: os: rename SyscallError.Errno to SyscallError.Err (issue 5651084)

32 views
Skip to first unread message

al...@pbrane.org

unread,
Feb 13, 2012, 4:37:49 AM2/13/12
to golan...@googlegroups.com, re...@codereview-hr.appspotmail.com
Reviewers: golang-dev_googlegroups.com,

Message:
Hello golan...@googlegroups.com,

I'd like you to review this change to
https://code.google.com/p/go/


Description:
os: rename SyscallError.Errno to SyscallError.Err

This lets us get rid of the OS-dependent implementations
of SyscallError. The name "Err" was chosen to match the
PathError type.

Please review this at http://codereview.appspot.com/5651084/

Affected files:
M src/pkg/os/error.go
M src/pkg/os/error_plan9.go
M src/pkg/os/error_posix.go


Index: src/pkg/os/error.go
===================================================================
--- a/src/pkg/os/error.go
+++ b/src/pkg/os/error.go
@@ -12,3 +12,21 @@
}

func (e *PathError) Error() string { return e.Op + " " + e.Path + ": " +
e.Err.Error() }
+
+// SyscallError records an error from a specific system call.
+type SyscallError struct {
+ Syscall string
+ Err error
+}
+
+func (e *SyscallError) Error() string { return e.Syscall + ": " +
e.Err.Error() }
+
+// NewSyscallError returns, as an error, a new SyscallError
+// with the given system call name and error details.
+// As a convenience, if err is nil, NewSyscallError returns nil.
+func NewSyscallError(syscall string, err error) error {
+ if err == nil {
+ return nil
+ }
+ return &SyscallError{syscall, err}
+}
Index: src/pkg/os/error_plan9.go
===================================================================
--- a/src/pkg/os/error_plan9.go
+++ b/src/pkg/os/error_plan9.go
@@ -9,24 +9,6 @@
"syscall"
)

-// SyscallError records an error from a specific system call.
-type SyscallError struct {
- Syscall string
- Err string
-}
-
-func (e *SyscallError) Error() string { return e.Syscall + ": " + e.Err }
-
-// NewSyscallError returns, as an error, a new SyscallError
-// with the given system call name and error details.
-// As a convenience, if err is nil, NewSyscallError returns nil.
-func NewSyscallError(syscall string, err error) error {
- if err == nil {
- return nil
- }
- return &SyscallError{syscall, err.Error()}
-}
-
var (
Eshortstat = errors.New("stat buffer too small")
Ebadstat = errors.New("malformed stat buffer")
Index: src/pkg/os/error_posix.go
===================================================================
--- a/src/pkg/os/error_posix.go
+++ b/src/pkg/os/error_posix.go
@@ -6,7 +6,7 @@

package os

-import syscall "syscall"
+import "syscall"

// Commonly known Unix errors.
var (
@@ -49,21 +49,3 @@
ETIMEDOUT error = syscall.ETIMEDOUT
ENOTCONN error = syscall.ENOTCONN
)
-
-// SyscallError records an error from a specific system call.
-type SyscallError struct {
- Syscall string
- Errno error
-}
-
-func (e *SyscallError) Error() string { return e.Syscall + ": " +
e.Errno.Error() }
-
-// NewSyscallError returns, as an error, a new SyscallError
-// with the given system call name and error details.
-// As a convenience, if err is nil, NewSyscallError returns nil.
-func NewSyscallError(syscall string, err error) error {
- if err == nil {
- return nil
- }
- return &SyscallError{syscall, err}
-}


Russ Cox

unread,
Feb 13, 2012, 9:31:37 AM2/13/12
to al...@pbrane.org, golan...@googlegroups.com, re...@codereview-hr.appspotmail.com
LGTM

r...@golang.org

unread,
Feb 14, 2012, 2:22:37 PM2/14/12
to al...@pbrane.org, golan...@googlegroups.com, re...@codereview-hr.appspotmail.com
*** Submitted as
http://code.google.com/p/go/source/detail?r=0158e2415ca5 ***

os: rename SyscallError.Errno to SyscallError.Err

This lets us get rid of the OS-dependent implementations
of SyscallError. The name "Err" was chosen to match the
PathError type.

R=golang-dev, rsc
CC=golang-dev
http://codereview.appspot.com/5651084

Committer: Russ Cox <r...@golang.org>


http://codereview.appspot.com/5651084/

Reply all
Reply to author
Forward
0 new messages