]> Cypherpunks repositories - gostls13.git/commitdiff
internal/coverage: use io.Seek* constants
authorTobias Klauser <tklauser@distanz.ch>
Mon, 28 Nov 2022 13:23:07 +0000 (14:23 +0100)
committerGopher Robot <gobot@golang.org>
Thu, 1 Dec 2022 18:01:23 +0000 (18:01 +0000)
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>

src/internal/coverage/decodecounter/decodecounterfile.go
src/internal/coverage/test/counter_test.go

index d1ae5e838618259b2473b2ca3feff2448a5db64c..fce060aabaa31b76304407854e7014d757c40ccc 100644 (file)
@@ -79,7 +79,7 @@ func checkMagic(v [4]byte) bool {
 
 func (cdr *CounterDataReader) readFooter() error {
        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
        }
        if err := binary.Read(cdr.mr, binary.LittleEndian, &cdr.ftr); err != nil {
@@ -115,13 +115,13 @@ func (cdr *CounterDataReader) readSegmentPreamble() error {
                return err
        }
        // 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
        } else {
                rem := of % 4
                if rem != 0 {
                        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
                        }
                }
@@ -248,7 +248,7 @@ func (cdr *CounterDataReader) BeginNextSegment() (bool, error) {
        cdr.fcnCount = 0
        // Seek past footer from last segment.
        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
        }
        // Read preamble for this segment.
index 09ce235e2a00d8bd359e7d4b49977a9a891ae311..3fc111ea123cdc329bb9cb9ef90b58fbd4bf1192 100644 (file)
@@ -9,6 +9,7 @@ import (
        "internal/coverage"
        "internal/coverage/decodecounter"
        "internal/coverage/encodecounter"
+       "io"
        "os"
        "path/filepath"
        "testing"
@@ -208,8 +209,7 @@ func TestCounterDataAppendSegment(t *testing.T) {
        }
 
        for sidx := 0; sidx < int(ns); sidx++ {
-
-               if off, err := inf.Seek(0, os.SEEK_CUR); err != nil {
+               if off, err := inf.Seek(0, io.SeekCurrent); err != nil {
                        t.Fatalf("Seek failed: %v", err)
                } else {
                        t.Logf("sidx=%d off=%d\n", sidx, off)