From b8a5e75d03e85683aaf66db93466eea2269feb5e Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Thu, 23 Oct 2008 12:41:06 -0700 Subject: use &T{1,2,3} constructor for simple new cases R=r OCL=17691 CL=17719 --- src/lib/bufio.go | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) (limited to 'src/lib/bufio.go') 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) { -- cgit v1.2.3