diff options
Diffstat (limited to 'doc/progs/cat_rot13.go')
| -rw-r--r-- | doc/progs/cat_rot13.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/progs/cat_rot13.go b/doc/progs/cat_rot13.go index 0eefe7cfc..c8584ed47 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 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 error) { r, e := r13.source.Read(b) for i := 0; i < r; i++ { b[i] = rot13(b[i]) @@ -47,7 +47,8 @@ func (r13 *rotate13) Read(b []byte) (ret int, err os.Error) { func (r13 *rotate13) String() string { return r13.source.String() } -// end of rotate13 implementation + +// end of rotate13 implementation OMIT func cat(r reader) { const NBUF = 512 @@ -59,14 +60,14 @@ func cat(r reader) { for { switch nr, er := r.Read(buf[:]); { case nr < 0: - fmt.Fprintf(os.Stderr, "cat: error reading from %s: %s\n", r.String(), er.String()) + fmt.Fprintf(os.Stderr, "cat: error reading from %s: %s\n", r, er) os.Exit(1) case nr == 0: // EOF return case nr > 0: nw, ew := file.Stdout.Write(buf[0:nr]) if nw != nr { - fmt.Fprintf(os.Stderr, "cat: error writing from %s: %s\n", r.String(), ew.String()) + fmt.Fprintf(os.Stderr, "cat: error writing from %s: %s\n", r, ew) os.Exit(1) } } |