oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-17 16:33:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove deprecated os.SEEK_SET os.SEEK_CUR (#2693)

Browse Source 
Signed-off-by: guoguangwu <guoguangwug@gmail.com>
This commit is contained in:
guangwu 2024-03-08 02:10:48 +08:00 committed by GitHub
parent e2a9d891b2
commit ebb9d4edb6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
syft/pkg/cataloger/golang/internal/xcoff/file.go
View File

@ -168,7 +168,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
@ -205,7 +205,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).
@ -214,7 +214,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)
@ -224,7 +224,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)
@ -270,7 +270,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)
@ -356,7 +356,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
} }
} }
@ -383,7 +383,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
} }
} }
@ -398,7 +398,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++ {
@ -509,7 +509,7 @@ func (s *Section) Data() ([]byte, 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
@ -535,7 +535,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)
@ -578,7 +578,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
@ -607,7 +607,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)
@ -622,7 +622,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)