From acc757f678a42ba1ffbf8bb9886de4fe080302de Mon Sep 17 00:00:00 2001 From: Joe Tsai Date: Tue, 5 Apr 2016 11:22:53 -0700 Subject: all: use SeekStart, SeekCurrent, SeekEnd CL/19862 (f79b50b8d5bc159561c1dcf7c17e2a0db96a9a11) recently introduced the constants SeekStart, SeekCurrent, and SeekEnd to the io package. We should use these constants consistently throughout the code base. Updates #15269 Change-Id: If7fcaca7676e4a51f588528f5ced28220d9639a2 Reviewed-on: https://go-review.googlesource.com/22097 Reviewed-by: Brad Fitzpatrick Run-TryBot: Joe Tsai TryBot-Result: Gobot Gobot --- src/net/file_plan9.go | 2 +- src/net/http/internal/chunked_test.go | 2 +- src/net/lookup_plan9.go | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/net') diff --git a/src/net/file_plan9.go b/src/net/file_plan9.go index 892775a024..24efdc5186 100644 --- a/src/net/file_plan9.go +++ b/src/net/file_plan9.go @@ -60,7 +60,7 @@ func newFileFD(f *os.File) (net *netFD, err error) { dir := netdir + "/" + comp[n-2] ctl = os.NewFile(uintptr(fd), dir+"/"+file) - ctl.Seek(0, 0) + ctl.Seek(0, io.SeekStart) var buf [16]byte n, err := ctl.Read(buf[:]) if err != nil { diff --git a/src/net/http/internal/chunked_test.go b/src/net/http/internal/chunked_test.go index a136dc99a6..9abe1ab6d9 100644 --- a/src/net/http/internal/chunked_test.go +++ b/src/net/http/internal/chunked_test.go @@ -122,7 +122,7 @@ func TestChunkReaderAllocs(t *testing.T) { byter := bytes.NewReader(buf.Bytes()) bufr := bufio.NewReader(byter) mallocs := testing.AllocsPerRun(100, func() { - byter.Seek(0, 0) + byter.Seek(0, io.SeekStart) bufr.Reset(byter) r := NewChunkedReader(bufr) n, err := io.ReadFull(r, readBuf) diff --git a/src/net/lookup_plan9.go b/src/net/lookup_plan9.go index 73147a2d3f..3f7af2a174 100644 --- a/src/net/lookup_plan9.go +++ b/src/net/lookup_plan9.go @@ -7,6 +7,7 @@ package net import ( "context" "errors" + "io" "os" ) @@ -17,7 +18,7 @@ func query(ctx context.Context, filename, query string, bufSize int) (res []stri } defer file.Close() - _, err = file.Seek(0, 0) + _, err = file.Seek(0, io.SeekStart) if err != nil { return } @@ -25,7 +26,7 @@ func query(ctx context.Context, filename, query string, bufSize int) (res []stri if err != nil { return } - _, err = file.Seek(0, 0) + _, err = file.Seek(0, io.SeekStart) if err != nil { return } -- cgit v1.3-5-g9baa