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/cmd/go/note.go | 2 +- src/cmd/internal/goobj/read.go | 8 ++++---- src/cmd/pack/pack.go | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/cmd') diff --git a/src/cmd/go/note.go b/src/cmd/go/note.go index ada8ddded4..fae9536d13 100644 --- a/src/cmd/go/note.go +++ b/src/cmd/go/note.go @@ -110,7 +110,7 @@ func readELFGoBuildID(filename string, f *os.File, data []byte) (buildid string, // or even the first few megabytes of the file // due to differences in note segment placement; // in that case, extract the note data manually. - _, err = f.Seek(int64(p.Off), 0) + _, err = f.Seek(int64(p.Off), io.SeekStart) if err != nil { return "", err } diff --git a/src/cmd/internal/goobj/read.go b/src/cmd/internal/goobj/read.go index 69fa496110..214f65cbc4 100644 --- a/src/cmd/internal/goobj/read.go +++ b/src/cmd/internal/goobj/read.go @@ -290,9 +290,9 @@ func importPathToPrefix(s string) string { func (r *objReader) init(f io.ReadSeeker, p *Package) { r.f = f r.p = p - r.offset, _ = f.Seek(0, 1) - r.limit, _ = f.Seek(0, 2) - f.Seek(r.offset, 0) + r.offset, _ = f.Seek(0, io.SeekCurrent) + r.limit, _ = f.Seek(0, io.SeekEnd) + f.Seek(r.offset, io.SeekStart) r.b = bufio.NewReader(f) r.pkgprefix = importPathToPrefix(p.ImportPath) + "." } @@ -440,7 +440,7 @@ func (r *objReader) skip(n int64) { r.readFull(r.tmp[:n]) } else { // Seek, giving up buffered data. - _, err := r.f.Seek(r.offset+n, 0) + _, err := r.f.Seek(r.offset+n, io.SeekStart) if err != nil { r.error(err) } diff --git a/src/cmd/pack/pack.go b/src/cmd/pack/pack.go index 5be42555d0..1c168f946b 100644 --- a/src/cmd/pack/pack.go +++ b/src/cmd/pack/pack.go @@ -286,7 +286,7 @@ func (ar *Archive) output(entry *Entry, w io.Writer) { log.Fatal("short file") } if entry.size&1 == 1 { - _, err := ar.fd.Seek(1, 1) + _, err := ar.fd.Seek(1, io.SeekCurrent) if err != nil { log.Fatal(err) } @@ -299,7 +299,7 @@ func (ar *Archive) skip(entry *Entry) { if size&1 == 1 { size++ } - _, err := ar.fd.Seek(size, 1) + _, err := ar.fd.Seek(size, io.SeekCurrent) if err != nil { log.Fatal(err) } -- cgit v1.3