From 3696e3e558a5be76b8af9698ff0e56719e47ec59 Mon Sep 17 00:00:00 2001 From: Rob Pike Date: Fri, 17 Apr 2009 00:08:24 -0700 Subject: Step 1 of the Big Error Shift: make os.Error an interface and replace *os.Errors with os.Errors. lib/template updated to use new setup; its clients also updated. Step 2 will make os's error support internally much cleaner. R=rsc OCL=27586 CL=27586 --- doc/progs/file.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'doc/progs/file.go') diff --git a/doc/progs/file.go b/doc/progs/file.go index e2ecf9209..0f9a4a9f8 100644 --- a/doc/progs/file.go +++ b/doc/progs/file.go @@ -27,12 +27,12 @@ var ( Stderr = newFile(2, "/dev/stderr"); ) -func Open(name string, mode int64, perm int64) (file *File, err *os.Error) { +func Open(name string, mode int64, perm int64) (file *File, err os.Error) { r, e := syscall.Open(name, mode, perm); return newFile(r, name), os.ErrnoToError(e) } -func (file *File) Close() *os.Error { +func (file *File) Close() os.Error { if file == nil { return os.EINVAL } @@ -41,7 +41,7 @@ func (file *File) Close() *os.Error { return nil } -func (file *File) Read(b []byte) (ret int, err *os.Error) { +func (file *File) Read(b []byte) (ret int, err os.Error) { if file == nil { return -1, os.EINVAL } @@ -49,7 +49,7 @@ func (file *File) Read(b []byte) (ret int, err *os.Error) { return int(r), os.ErrnoToError(e) } -func (file *File) Write(b []byte) (ret int, err *os.Error) { +func (file *File) Write(b []byte) (ret int, err os.Error) { if file == nil { return -1, os.EINVAL } -- cgit v1.2.3