diff options
author | Russ Cox <rsc@golang.org> | 2008-10-23 12:41:06 -0700 |
---|---|---|
committer | Russ Cox <rsc@golang.org> | 2008-10-23 12:41:06 -0700 |
commit | b8a5e75d03e85683aaf66db93466eea2269feb5e (patch) | |
tree | a37d597ea446b1f676b4938ff27a495e727971ef /src/lib/bufio.go | |
parent | dad392e28e35848ebc43bc71ea0441e13e6482e0 (diff) | |
download | golang-b8a5e75d03e85683aaf66db93466eea2269feb5e.tar.gz |
use &T{1,2,3} constructor for simple new cases
R=r
OCL=17691
CL=17719
Diffstat (limited to 'src/lib/bufio.go')
-rw-r--r-- | src/lib/bufio.go | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/src/lib/bufio.go b/src/lib/bufio.go index 883183629..f41c4cd3d 100644 --- a/src/lib/bufio.go +++ b/src/lib/bufio.go @@ -17,20 +17,13 @@ const ( DefaultBufSize = 4096 ) -func NewError(s string) *os.Error { - // BUG return &os.Error{s}; - e := new(os.Error); - e.s = s; - return e -} - export var ( - EndOfFile = NewError("end of file"); - PhaseError = NewError("phase error"); - BufferFull = NewError("buffer full"); - InternalError = NewError("bufio internal error"); - BadBufSize = NewError("bad bufio size"); - ShortWrite = NewError("short write"); + EndOfFile = os.NewError("end of file"); + PhaseError = os.NewError("phase error"); + BufferFull = os.NewError("buffer full"); + InternalError = os.NewError("bufio internal error"); + BadBufSize = os.NewError("bad bufio size"); + ShortWrite = os.NewError("short write"); ) func CopySlice(dst *[]byte, src *[]byte) { @@ -43,10 +36,10 @@ func CopySlice(dst *[]byte, src *[]byte) { // Buffered input. export type BufRead struct { - err *os.Error; buf *[]byte; - r, w int; rd io.Read; + r, w int; + err *os.Error; } export func NewBufReadSize(rd io.Read, size int) (b *BufRead, err *os.Error) { |