diff options
author | Rob Pike <r@golang.org> | 2009-04-17 00:08:24 -0700 |
---|---|---|
committer | Rob Pike <r@golang.org> | 2009-04-17 00:08:24 -0700 |
commit | 3696e3e558a5be76b8af9698ff0e56719e47ec59 (patch) | |
tree | c20f34ec6f9dea967a511f65b239c5e8637fec8f /usr/gri/pretty/platform.go | |
parent | df02778ccda228c665179d0ff3dac77217ad6633 (diff) | |
download | golang-3696e3e558a5be76b8af9698ff0e56719e47ec59.tar.gz |
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
Diffstat (limited to 'usr/gri/pretty/platform.go')
-rw-r--r-- | usr/gri/pretty/platform.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/gri/pretty/platform.go b/usr/gri/pretty/platform.go index 90b9d5ebb..25f7a7bba 100644 --- a/usr/gri/pretty/platform.go +++ b/usr/gri/pretty/platform.go @@ -19,7 +19,7 @@ var USER string; func init() { - var e *OS.Error; + var e OS.Error; GOARCH, e = OS.Getenv("GOARCH"); GOOS, e = OS.Getenv("GOOS"); @@ -37,7 +37,7 @@ const ( Obj_file_ext = ".7"; ) -func readfile(filename string) ([]byte, *OS.Error) { +func readfile(filename string) ([]byte, OS.Error) { f, err := OS.Open(filename, OS.O_RDONLY, 0); if err != nil { return []byte{}, err; @@ -51,7 +51,7 @@ func readfile(filename string) ([]byte, *OS.Error) { return buf[0:n], err1; } -func writefile(name, data string) *OS.Error { +func writefile(name, data string) OS.Error { fd, err := OS.Open(name, OS.O_WRONLY, 0); if err != nil { return err; |