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

all: use io.Seek* instead of deprecated os.SEEK_*

Browse source 
These are available since Go 1.7. The version used for bootstrap is Go
1.17 for Go 1.20.

For #44505

Change-Id: I497c9f617baefdeb273cd115b08b6e31bd10aad2
Reviewed-on: https://go-review.googlesource.com/c/go/+/421634
Reviewed-by: Than McIntosh <thanm@google.com>
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
This commit is contained in:
Tobias Klauser 2022-08-05 11:37:47 +02:00 • committed by Tobias Klauser
parent 2493072db6
commit 0a86cd6857
8 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/cmd/compile/internal/typecheck/iimport.go
View file

@ -13,7 +13,6 @@ import (
"go/constant" "go/constant"
"io" "io"
"math/big" "math/big"
"os"
"strings" "strings"
"cmd/compile/internal/base" "cmd/compile/internal/base"
@ -152,7 +151,7 @@ func ReadImports(pkg *types.Pkg, data string) {
whence, _ := ird.Seek(0, io.SeekCurrent) whence, _ := ird.Seek(0, io.SeekCurrent)
stringData := data[whence : whence+sLen] stringData := data[whence : whence+sLen]
declData := data[whence+sLen : whence+sLen+dLen] declData := data[whence+sLen : whence+sLen+dLen]
ird.Seek(sLen+dLen, os.SEEK_CUR) ird.Seek(sLen+dLen, io.SeekCurrent)
p := &iimporter{ p := &iimporter{
exportVersion: version, exportVersion: version,

10
src/cmd/internal/archive/archive.go
View file

@ -124,9 +124,9 @@ type objReader struct {
func (r *objReader) init(f *os.File) { func (r *objReader) init(f *os.File) {
r.a = &Archive{f, nil} r.a = &Archive{f, nil}
r.offset, _ = f.Seek(0, os.SEEK_CUR) r.offset, _ = f.Seek(0, io.SeekCurrent)
r.limit, _ = f.Seek(0, os.SEEK_END) r.limit, _ = f.Seek(0, io.SeekEnd)
f.Seek(r.offset, os.SEEK_SET) f.Seek(r.offset, io.SeekStart)
r.b = bio.NewReader(f) r.b = bio.NewReader(f)
} }
@ -227,7 +227,7 @@ func (r *objReader) skip(n int64) {
r.readFull(r.tmp[:n]) r.readFull(r.tmp[:n])
} else { } else {
// Seek, giving up buffered data. // Seek, giving up buffered data.
r.b.MustSeek(r.offset+n, os.SEEK_SET) r.b.MustSeek(r.offset+n, io.SeekStart)
r.offset += n r.offset += n
} }
} }
@ -435,7 +435,7 @@ func (r *objReader) parseObject(o *GoObj, size int64) error {
// AddEntry adds an entry to the end of a, with the content from r. // AddEntry adds an entry to the end of a, with the content from r.
func (a *Archive) AddEntry(typ EntryType, name string, mtime int64, uid, gid int, mode os.FileMode, size int64, r io.Reader) { func (a *Archive) AddEntry(typ EntryType, name string, mtime int64, uid, gid int, mode os.FileMode, size int64, r io.Reader) {
off, err := a.f.Seek(0, os.SEEK_END) off, err := a.f.Seek(0, io.SeekEnd)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }

3
src/cmd/link/internal/loader/loader.go
View file

@ -14,6 +14,7 @@ import (
"cmd/link/internal/sym" "cmd/link/internal/sym"
"debug/elf" "debug/elf"
"fmt" "fmt"
"io"
"log" "log"
"math/bits" "math/bits"
"os" "os"
@ -2081,7 +2082,7 @@ func (l *Loader) Preload(localSymVersion int, f *bio.Reader, lib *sym.Library, u
l.addObj(lib.Pkg, or) l.addObj(lib.Pkg, or)
// The caller expects us consuming all the data // The caller expects us consuming all the data
f.MustSeek(length, os.SEEK_CUR) f.MustSeek(length, io.SeekCurrent)
return r.Fingerprint() return r.Fingerprint()
} }

2
src/internal/pkgbits/decoder.go
View file

@ -95,7 +95,7 @@ func NewPkgDecoder(pkgPath, input string) PkgDecoder {
pr.elemEnds = make([]uint32, pr.elemEndsEnds[len(pr.elemEndsEnds)-1]) pr.elemEnds = make([]uint32, pr.elemEndsEnds[len(pr.elemEndsEnds)-1])
assert(binary.Read(r, binary.LittleEndian, pr.elemEnds[:]) == nil) assert(binary.Read(r, binary.LittleEndian, pr.elemEnds[:]) == nil)
pos, err := r.Seek(0, os.SEEK_CUR) pos, err := r.Seek(0, io.SeekCurrent)
assert(err == nil) assert(err == nil)
pr.elemData = input[pos:] pr.elemData = input[pos:]

6
src/internal/xcoff/ar.go
View file

@ -123,7 +123,7 @@ func NewArchive(r io.ReaderAt) (*Archive, error) {
} }
var fhdr bigarFileHeader var fhdr bigarFileHeader
if _, err := sr.Seek(0, os.SEEK_SET); err != nil { if _, err := sr.Seek(0, io.SeekStart); err != nil {
return nil, err return nil, err
} }
if err := binary.Read(sr, binary.BigEndian, &fhdr); err != nil { if err := binary.Read(sr, binary.BigEndian, &fhdr); err != nil {
@ -151,7 +151,7 @@ func NewArchive(r io.ReaderAt) (*Archive, error) {
// The member header is normally 2 bytes larger. But it's easier // The member header is normally 2 bytes larger. But it's easier
// to read the name if the header is read without _ar_nam. // to read the name if the header is read without _ar_nam.
// However, AIAFMAG must be read afterward. // However, AIAFMAG must be read afterward.
if _, err := sr.Seek(off, os.SEEK_SET); err != nil { if _, err := sr.Seek(off, io.SeekStart); err != nil {
return nil, err return nil, err
} }
@ -183,7 +183,7 @@ func NewArchive(r io.ReaderAt) (*Archive, error) {
fileoff := off + AR_HSZ_BIG + namlen fileoff := off + AR_HSZ_BIG + namlen
if fileoff&1 != 0 { if fileoff&1 != 0 {
fileoff++ fileoff++
if _, err := sr.Seek(1, os.SEEK_CUR); err != nil { if _, err := sr.Seek(1, io.SeekCurrent); err != nil {
return nil, err return nil, err
} }
} }

26
src/internal/xcoff/file.go
View file

@ -167,7 +167,7 @@ func NewFile(r io.ReaderAt) (*File, error) {
f.TargetMachine = magic f.TargetMachine = magic
// Read XCOFF file header // Read XCOFF file header
if _, err := sr.Seek(0, os.SEEK_SET); err != nil { if _, err := sr.Seek(0, io.SeekStart); err != nil {
return nil, err return nil, err
} }
var nscns uint16 var nscns uint16
@ -204,7 +204,7 @@ func NewFile(r io.ReaderAt) (*File, error) {
// Read string table (located right after symbol table). // Read string table (located right after symbol table).
offset := symptr + uint64(nsyms)*SYMESZ offset := symptr + uint64(nsyms)*SYMESZ
if _, err := sr.Seek(int64(offset), os.SEEK_SET); err != nil { if _, err := sr.Seek(int64(offset), io.SeekStart); err != nil {
return nil, err return nil, err
} }
// The first 4 bytes contain the length (in bytes). // The first 4 bytes contain the length (in bytes).
@ -213,7 +213,7 @@ func NewFile(r io.ReaderAt) (*File, error) {
return nil, err return nil, err
} }
if l > 4 { if l > 4 {
if _, err := sr.Seek(int64(offset), os.SEEK_SET); err != nil { if _, err := sr.Seek(int64(offset), io.SeekStart); err != nil {
return nil, err return nil, err
} }
f.StringTable = make([]byte, l) f.StringTable = make([]byte, l)
@ -223,7 +223,7 @@ func NewFile(r io.ReaderAt) (*File, error) {
} }
// Read section headers // Read section headers
if _, err := sr.Seek(int64(hdrsz)+int64(opthdr), os.SEEK_SET); err != nil { if _, err := sr.Seek(int64(hdrsz)+int64(opthdr), io.SeekStart); err != nil {
return nil, err return nil, err
} }
f.Sections = make([]*Section, nscns) f.Sections = make([]*Section, nscns)
@ -269,7 +269,7 @@ func NewFile(r io.ReaderAt) (*File, error) {
var idxToSym = make(map[int]*Symbol) var idxToSym = make(map[int]*Symbol)
// Read symbol table // Read symbol table
if _, err := sr.Seek(int64(symptr), os.SEEK_SET); err != nil { if _, err := sr.Seek(int64(symptr), io.SeekStart); err != nil {
return nil, err return nil, err
} }
f.Symbols = make([]*Symbol, 0) f.Symbols = make([]*Symbol, 0)
@ -355,7 +355,7 @@ func NewFile(r io.ReaderAt) (*File, error) {
// Read csect auxiliary entry (by convention, it is the last). // Read csect auxiliary entry (by convention, it is the last).
if !needAuxFcn { if !needAuxFcn {
if _, err := sr.Seek(int64(numaux-1)*SYMESZ, os.SEEK_CUR); err != nil { if _, err := sr.Seek(int64(numaux-1)*SYMESZ, io.SeekCurrent); err != nil {
return nil, err return nil, err
} }
} }
@ -382,7 +382,7 @@ func NewFile(r io.ReaderAt) (*File, error) {
f.Symbols = append(f.Symbols, sym) f.Symbols = append(f.Symbols, sym)
skip: skip:
i += numaux // Skip auxiliary entries i += numaux // Skip auxiliary entries
if _, err := sr.Seek(int64(numaux)*SYMESZ, os.SEEK_CUR); err != nil { if _, err := sr.Seek(int64(numaux)*SYMESZ, io.SeekCurrent); err != nil {
return nil, err return nil, err
} }
} }
@ -397,7 +397,7 @@ func NewFile(r io.ReaderAt) (*File, error) {
if sect.Relptr == 0 { if sect.Relptr == 0 {
continue continue
} }
if _, err := sr.Seek(int64(sect.Relptr), os.SEEK_SET); err != nil { if _, err := sr.Seek(int64(sect.Relptr), io.SeekStart); err != nil {
return nil, err return nil, err
} }
for i := uint32(0); i < sect.Nreloc; i++ { for i := uint32(0); i < sect.Nreloc; i++ {
@ -508,7 +508,7 @@ func (f *File) DWARF() (*dwarf.Data, error) {
// Library name pattern is either path/base/member or base/member // Library name pattern is either path/base/member or base/member
func (f *File) readImportIDs(s *Section) ([]string, error) { func (f *File) readImportIDs(s *Section) ([]string, error) {
// Read loader header // Read loader header
if _, err := s.sr.Seek(0, os.SEEK_SET); err != nil { if _, err := s.sr.Seek(0, io.SeekStart); err != nil {
return nil, err return nil, err
} }
var istlen uint32 var istlen uint32
@ -534,7 +534,7 @@ func (f *File) readImportIDs(s *Section) ([]string, error) {
} }
// Read loader import file ID table // Read loader import file ID table
if _, err := s.sr.Seek(int64(impoff), os.SEEK_SET); err != nil { if _, err := s.sr.Seek(int64(impoff), io.SeekStart); err != nil {
return nil, err return nil, err
} }
table := make([]byte, istlen) table := make([]byte, istlen)
@ -577,7 +577,7 @@ func (f *File) ImportedSymbols() ([]ImportedSymbol, error) {
return nil, nil return nil, nil
} }
// Read loader header // Read loader header
if _, err := s.sr.Seek(0, os.SEEK_SET); err != nil { if _, err := s.sr.Seek(0, io.SeekStart); err != nil {
return nil, err return nil, err
} }
var stlen uint32 var stlen uint32
@ -606,7 +606,7 @@ func (f *File) ImportedSymbols() ([]ImportedSymbol, error) {
} }
// Read loader section string table // Read loader section string table
if _, err := s.sr.Seek(int64(stoff), os.SEEK_SET); err != nil { if _, err := s.sr.Seek(int64(stoff), io.SeekStart); err != nil {
return nil, err return nil, err
} }
st := make([]byte, stlen) st := make([]byte, stlen)
@ -621,7 +621,7 @@ func (f *File) ImportedSymbols() ([]ImportedSymbol, error) {
} }
// Read loader symbol table // Read loader symbol table
if _, err := s.sr.Seek(int64(symoff), os.SEEK_SET); err != nil { if _, err := s.sr.Seek(int64(symoff), io.SeekStart); err != nil {
return nil, err return nil, err
} }
all := make([]ImportedSymbol, 0) all := make([]ImportedSymbol, 0)

2
src/net/sendfile_test.go
View file

@ -175,7 +175,7 @@ func TestSendfileSeeked(t *testing.T) {
return return
} }
defer f.Close() defer f.Close()
if _, err := f.Seek(seekTo, os.SEEK_SET); err != nil { if _, err := f.Seek(seekTo, io.SeekStart); err != nil {
errc <- err errc <- err
return return
} }

2
src/testing/run_example_js.go
View file

@ -36,7 +36,7 @@ func runExample(eg InternalExample) (ok bool) {
// Restore stdout, get output and remove temporary file. // Restore stdout, get output and remove temporary file.
os.Stdout = stdout os.Stdout = stdout
var buf strings.Builder var buf strings.Builder
_, seekErr := f.Seek(0, os.SEEK_SET) _, seekErr := f.Seek(0, io.SeekStart)
_, readErr := io.Copy(&buf, f) _, readErr := io.Copy(&buf, f)
out := buf.String() out := buf.String()
f.Close() f.Close()