diff options
| author | Joe Tsai <joetsai@digital-static.net> | 2016-04-05 11:22:53 -0700 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2016-05-06 00:10:41 +0000 |
| commit | acc757f678a42ba1ffbf8bb9886de4fe080302de (patch) | |
| tree | f412c541e65290080925060d7d748ec7ef4f4ecb /src/debug | |
| parent | 6db98a3c51549eb5e1e481e9bca6ede7e8e15f54 (diff) | |
| download | go-acc757f678a42ba1ffbf8bb9886de4fe080302de.tar.xz | |
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 <bradfitz@golang.org>
Run-TryBot: Joe Tsai <joetsai@digital-static.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/debug')
| -rw-r--r-- | src/debug/elf/file_test.go | 8 | ||||
| -rw-r--r-- | src/debug/elf/reader.go | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/debug/elf/file_test.go b/src/debug/elf/file_test.go index 2fe6febb26..b189219a55 100644 --- a/src/debug/elf/file_test.go +++ b/src/debug/elf/file_test.go @@ -655,7 +655,7 @@ func TestCompressedSection(t *testing.T) { // Test Open method and seeking. buf, have, count := make([]byte, len(b)), make([]bool, len(b)), 0 sf := sec.Open() - if got, err := sf.Seek(0, 2); got != int64(len(b)) || err != nil { + if got, err := sf.Seek(0, io.SeekEnd); got != int64(len(b)) || err != nil { t.Fatalf("want seek end %d, got %d error %v", len(b), got, err) } if n, err := sf.Read(buf); n != 0 || err != io.EOF { @@ -668,11 +668,11 @@ func TestCompressedSection(t *testing.T) { target := rand.Int63n(int64(len(buf))) var offset int64 switch whence { - case 0: + case io.SeekStart: offset = target - case 1: + case io.SeekCurrent: offset = target - pos - case 2: + case io.SeekEnd: offset = target - int64(len(buf)) } pos, err = sf.Seek(offset, whence) diff --git a/src/debug/elf/reader.go b/src/debug/elf/reader.go index 4dac6d1b29..eab437318d 100644 --- a/src/debug/elf/reader.go +++ b/src/debug/elf/reader.go @@ -63,11 +63,11 @@ func (r *readSeekerFromReader) Read(p []byte) (n int, err error) { func (r *readSeekerFromReader) Seek(offset int64, whence int) (int64, error) { var newOffset int64 switch whence { - case 0: + case io.SeekStart: newOffset = offset - case 1: + case io.SeekCurrent: newOffset = r.offset + offset - case 2: + case io.SeekEnd: newOffset = r.size + offset default: return 0, os.ErrInvalid |