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/io | |
| 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/io')
| -rw-r--r-- | src/io/example_test.go | 2 | ||||
| -rw-r--r-- | src/io/io.go | 6 | ||||
| -rw-r--r-- | src/io/io_test.go | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/io/example_test.go b/src/io/example_test.go index 412dfb3b92..bf16de8fe2 100644 --- a/src/io/example_test.go +++ b/src/io/example_test.go @@ -189,7 +189,7 @@ func ExampleSectionReader_Seek() { r := strings.NewReader("some io.Reader stream to be read\n") s := io.NewSectionReader(r, 5, 16) - if _, err := s.Seek(10, 0); err != nil { + if _, err := s.Seek(10, io.SeekStart); err != nil { log.Fatal(err) } diff --git a/src/io/io.go b/src/io/io.go index c36ec2afbb..3d0a5a485e 100644 --- a/src/io/io.go +++ b/src/io/io.go @@ -480,11 +480,11 @@ func (s *SectionReader) Seek(offset int64, whence int) (int64, error) { switch whence { default: return 0, errWhence - case 0: + case SeekStart: offset += s.base - case 1: + case SeekCurrent: offset += s.off - case 2: + case SeekEnd: offset += s.limit } if offset < s.base { diff --git a/src/io/io_test.go b/src/io/io_test.go index e892574b0b..877e8392e2 100644 --- a/src/io/io_test.go +++ b/src/io/io_test.go @@ -347,7 +347,7 @@ func TestSectionReader_Seek(t *testing.T) { br := bytes.NewReader([]byte("foo")) sr := NewSectionReader(br, 0, int64(len("foo"))) - for whence := 0; whence <= 2; whence++ { + for _, whence := range []int{SeekStart, SeekCurrent, SeekEnd} { for offset := int64(-3); offset <= 4; offset++ { brOff, brErr := br.Seek(offset, whence) srOff, srErr := sr.Seek(offset, whence) @@ -359,7 +359,7 @@ func TestSectionReader_Seek(t *testing.T) { } // And verify we can just seek past the end and get an EOF - got, err := sr.Seek(100, 0) + got, err := sr.Seek(100, SeekStart) if err != nil || got != 100 { t.Errorf("Seek = %v, %v; want 100, nil", got, err) } |