mirror of
https://github.com/golang/go.git
synced 2025-12-08 06:10:04 +00:00
internal: use io.SeekStart, io.SeekCurrent, and io.SeekEnd
Change-Id: I23ab738b73bc33d3b0b10013c3fadd95b5b24681 Reviewed-on: https://go-review.googlesource.com/c/go/+/436719 Auto-Submit: Ian Lance Taylor <iant@google.com> Reviewed-by: Dmitri Shuralyov <dmitshur@google.com> TryBot-Result: Gopher Robot <gobot@golang.org> Reviewed-by: Ian Lance Taylor <iant@google.com> Run-TryBot: Ian Lance Taylor <iant@google.com>
This commit is contained in:
parent
daf1612dc7
commit
1b5110268b
4 changed files with 7 additions and 7 deletions
|
|
@ -63,7 +63,7 @@ func NewCounterDataReader(fn string, rs io.ReadSeeker) (*CounterDataReader, erro
|
|||
}
|
||||
// Seek back to just past the file header.
|
||||
hsz := int64(unsafe.Sizeof(cdr.hdr))
|
||||
if _, err := cdr.mr.Seek(hsz, os.SEEK_SET); err != nil {
|
||||
if _, err := cdr.mr.Seek(hsz, io.SeekStart); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
// Read preamble for first segment.
|
||||
|
|
|
|||
|
|
@ -213,7 +213,7 @@ func (r *CoverageMetaFileReader) GetPackagePayload(pkIdx uint32, payloadbuf []by
|
|||
payload = make([]byte, 0, len)
|
||||
}
|
||||
payload = append(payload, make([]byte, len)...)
|
||||
if _, err := r.f.Seek(int64(off), os.SEEK_SET); err != nil {
|
||||
if _, err := r.f.Seek(int64(off), io.SeekStart); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if _, err := io.ReadFull(r.f, payload); err != nil {
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ func (b *CoverageMetaDataBuilder) Emit(w io.WriteSeeker) ([16]byte, error) {
|
|||
|
||||
// Back-patch the length.
|
||||
totalLength := uint32(off)
|
||||
if _, err := w.Seek(0, os.SEEK_SET); err != nil {
|
||||
if _, err := w.Seek(0, io.SeekStart); err != nil {
|
||||
return digest, err
|
||||
}
|
||||
b.wrUint32(w, totalLength)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ package slicewriter
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"io"
|
||||
)
|
||||
|
||||
// WriteSeeker is a helper object that implements the io.WriteSeeker
|
||||
|
|
@ -37,20 +37,20 @@ func (sws *WriteSeeker) Write(p []byte) (n int, err error) {
|
|||
// the slice will result in an error.
|
||||
func (sws *WriteSeeker) Seek(offset int64, whence int) (int64, error) {
|
||||
switch whence {
|
||||
case os.SEEK_SET:
|
||||
case io.SeekStart:
|
||||
if sws.off != offset && (offset < 0 || offset >= int64(len(sws.payload))) {
|
||||
return 0, fmt.Errorf("invalid seek: new offset %d (out of range [0 %d]", offset, len(sws.payload))
|
||||
}
|
||||
sws.off = offset
|
||||
return offset, nil
|
||||
case os.SEEK_CUR:
|
||||
case io.SeekCurrent:
|
||||
newoff := sws.off + offset
|
||||
if newoff != sws.off && (newoff < 0 || newoff >= int64(len(sws.payload))) {
|
||||
return 0, fmt.Errorf("invalid seek: new offset %d (out of range [0 %d]", newoff, len(sws.payload))
|
||||
}
|
||||
sws.off += offset
|
||||
return sws.off, nil
|
||||
case os.SEEK_END:
|
||||
case io.SeekEnd:
|
||||
newoff := int64(len(sws.payload)) + offset
|
||||
if newoff != sws.off && (newoff < 0 || newoff >= int64(len(sws.payload))) {
|
||||
return 0, fmt.Errorf("invalid seek: new offset %d (out of range [0 %d]", newoff, len(sws.payload))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue