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

2 files changed, 6 insertions, 6 deletions

diff --git a/doc/progs/cat_rot13.go b/doc/progs/cat_rot13.go
index aba8b4c7f..7411a7bed 100644
--- a/doc/progs/cat_rot13.go
+++ b/doc/progs/cat_rot13.go
@@ -24,7 +24,7 @@ func rot13(b byte) byte {
 }
 
 type reader interface {
-	Read(b []byte) (ret int, err *os.Error);
+	Read(b []byte) (ret int, err os.Error);
 	String() string;
 }
 
@@ -36,7 +36,7 @@ func newRotate13(source reader) *rotate13 {
 	return &rotate13{source}
 }
 
-func (r13 *rotate13) Read(b []byte) (ret int, err *os.Error) {
+func (r13 *rotate13) Read(b []byte) (ret int, err os.Error) {
 	r, e := r13.source.Read(b);
 	for i := 0; i < r; i++ {
 		b[i] = rot13(b[i])
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
 	}