Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

internal/coverage: use io.Seek* constants

Browse source 
Use the io.Seek* constants instead of their deprecated os.SEEK_*
counterparts.

Change-Id: Ie899f9cf286de7304a394d9a2a091a55937542ad
Reviewed-on: https://go-review.googlesource.com/c/go/+/453576
Reviewed-by: Than McIntosh <thanm@google.com>
Auto-Submit: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Run-TryBot: Than McIntosh <thanm@google.com>
This commit is contained in:
Tobias Klauser 2022-11-28 14:23:07 +01:00 • committed by Gopher Robot
parent 791f758075
commit f5026496cf
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/internal/coverage/decodecounter/decodecounterfile.go
View file

@ -79,7 +79,7 @@ func checkMagic(v [4]byte) bool {
func (cdr *CounterDataReader) readFooter() error { func (cdr *CounterDataReader) readFooter() error {
ftrSize := int64(unsafe.Sizeof(cdr.ftr)) ftrSize := int64(unsafe.Sizeof(cdr.ftr))
if _, err := cdr.mr.Seek(-ftrSize, os.SEEK_END); err != nil { if _, err := cdr.mr.Seek(-ftrSize, io.SeekEnd); err != nil {
return err return err
} }
if err := binary.Read(cdr.mr, binary.LittleEndian, &cdr.ftr); err != nil { if err := binary.Read(cdr.mr, binary.LittleEndian, &cdr.ftr); err != nil {
@ -115,13 +115,13 @@ func (cdr *CounterDataReader) readSegmentPreamble() error {
return err return err
} }
// Seek past any padding to bring us up to a 4-byte boundary. // Seek past any padding to bring us up to a 4-byte boundary.
if of, err := cdr.mr.Seek(0, os.SEEK_CUR); err != nil { if of, err := cdr.mr.Seek(0, io.SeekCurrent); err != nil {
return err return err
} else { } else {
rem := of % 4 rem := of % 4
if rem != 0 { if rem != 0 {
pad := 4 - rem pad := 4 - rem
if _, err := cdr.mr.Seek(pad, os.SEEK_CUR); err != nil { if _, err := cdr.mr.Seek(pad, io.SeekCurrent); err != nil {
return err return err
} }
} }
@ -248,7 +248,7 @@ func (cdr *CounterDataReader) BeginNextSegment() (bool, error) {
cdr.fcnCount = 0 cdr.fcnCount = 0
// Seek past footer from last segment. // Seek past footer from last segment.
ftrSize := int64(unsafe.Sizeof(cdr.ftr)) ftrSize := int64(unsafe.Sizeof(cdr.ftr))
if _, err := cdr.mr.Seek(ftrSize, os.SEEK_CUR); err != nil { if _, err := cdr.mr.Seek(ftrSize, io.SeekCurrent); err != nil {
return false, err return false, err
} }
// Read preamble for this segment. // Read preamble for this segment.

4
src/internal/coverage/test/counter_test.go
View file

@ -9,6 +9,7 @@ import (
"internal/coverage" "internal/coverage"
"internal/coverage/decodecounter" "internal/coverage/decodecounter"
"internal/coverage/encodecounter" "internal/coverage/encodecounter"
"io"
"os" "os"
"path/filepath" "path/filepath"
"testing" "testing"
@ -208,8 +209,7 @@ func TestCounterDataAppendSegment(t *testing.T) {
} }
for sidx := 0; sidx < int(ns); sidx++ { for sidx := 0; sidx < int(ns); sidx++ {
if off, err := inf.Seek(0, io.SeekCurrent); err != nil {
if off, err := inf.Seek(0, os.SEEK_CUR); err != nil {
t.Fatalf("Seek failed: %v", err) t.Fatalf("Seek failed: %v", err)
} else { } else {
t.Logf("sidx=%d off=%d\n", sidx, off) t.Logf("sidx=%d off=%d\n", sidx, off)