aboutsummaryrefslogtreecommitdiff
path: root/src/internal
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2022-08-05 11:37:47 +0200
committerTobias Klauser <tobias.klauser@gmail.com>2022-08-08 17:01:54 +0000
commit0a86cd6857b9fb12a798b3dbcfb6974384aa07d6 (patch)
tree0a484af459668a34ba679ffe4edf8641049e8980 /src/internal
parent2493072db68a8f8b545bb2a6faebac0da0f01336 (diff)
downloadgo-0a86cd6857b9fb12a798b3dbcfb6974384aa07d6.tar.xz
all: use io.Seek* instead of deprecated os.SEEK_*
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>
Diffstat (limited to 'src/internal')
-rw-r--r--src/internal/pkgbits/decoder.go2
-rw-r--r--src/internal/xcoff/ar.go6
-rw-r--r--src/internal/xcoff/file.go26
3 files changed, 17 insertions, 17 deletions
diff --git a/src/internal/pkgbits/decoder.go b/src/internal/pkgbits/decoder.go
index b0150330d6..357e328a3b 100644
--- a/src/internal/pkgbits/decoder.go
+++ b/src/internal/pkgbits/decoder.go
@@ -95,7 +95,7 @@ func NewPkgDecoder(pkgPath, input string) PkgDecoder {
pr.elemEnds = make([]uint32, pr.elemEndsEnds[len(pr.elemEndsEnds)-1])
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)
pr.elemData = input[pos:]
diff --git a/src/internal/xcoff/ar.go b/src/internal/xcoff/ar.go
index 0fb410f7dd..2b432d5e10 100644
--- a/src/internal/xcoff/ar.go
+++ b/src/internal/xcoff/ar.go
@@ -123,7 +123,7 @@ func NewArchive(r io.ReaderAt) (*Archive, error) {
}
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
}
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
// to read the name if the header is read without _ar_nam.
// 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
}
@@ -183,7 +183,7 @@ func NewArchive(r io.ReaderAt) (*Archive, error) {
fileoff := off + AR_HSZ_BIG + namlen
if fileoff&1 != 0 {
fileoff++
- if _, err := sr.Seek(1, os.SEEK_CUR); err != nil {
+ if _, err := sr.Seek(1, io.SeekCurrent); err != nil {
return nil, err
}
}
diff --git a/src/internal/xcoff/file.go b/src/internal/xcoff/file.go
index 05e4fd555c..553103bdff 100644
--- a/src/internal/xcoff/file.go
+++ b/src/internal/xcoff/file.go
@@ -167,7 +167,7 @@ func NewFile(r io.ReaderAt) (*File, error) {
f.TargetMachine = magic
// 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
}
var nscns uint16
@@ -204,7 +204,7 @@ func NewFile(r io.ReaderAt) (*File, error) {
// Read string table (located right after symbol table).
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
}
// The first 4 bytes contain the length (in bytes).
@@ -213,7 +213,7 @@ func NewFile(r io.ReaderAt) (*File, error) {
return nil, err
}
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
}
f.StringTable = make([]byte, l)
@@ -223,7 +223,7 @@ func NewFile(r io.ReaderAt) (*File, error) {
}
// 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
}
f.Sections = make([]*Section, nscns)
@@ -269,7 +269,7 @@ func NewFile(r io.ReaderAt) (*File, error) {
var idxToSym = make(map[int]*Symbol)
// 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
}
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).
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
}
}
@@ -382,7 +382,7 @@ func NewFile(r io.ReaderAt) (*File, error) {
f.Symbols = append(f.Symbols, sym)
skip:
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
}
}
@@ -397,7 +397,7 @@ func NewFile(r io.ReaderAt) (*File, error) {
if sect.Relptr == 0 {
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
}
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
func (f *File) readImportIDs(s *Section) ([]string, error) {
// 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
}
var istlen uint32
@@ -534,7 +534,7 @@ func (f *File) readImportIDs(s *Section) ([]string, error) {
}
// 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
}
table := make([]byte, istlen)
@@ -577,7 +577,7 @@ func (f *File) ImportedSymbols() ([]ImportedSymbol, error) {
return nil, nil
}
// 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
}
var stlen uint32
@@ -606,7 +606,7 @@ func (f *File) ImportedSymbols() ([]ImportedSymbol, error) {
}
// 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
}
st := make([]byte, stlen)
@@ -621,7 +621,7 @@ func (f *File) ImportedSymbols() ([]ImportedSymbol, error) {
}
// 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
}
all := make([]ImportedSymbol, 0)