diff options
Diffstat (limited to 'src/debug/elf')
| -rw-r--r-- | src/debug/elf/file.go | 21 | ||||
| -rw-r--r-- | src/debug/elf/reader.go | 6 |
2 files changed, 8 insertions, 19 deletions
diff --git a/src/debug/elf/file.go b/src/debug/elf/file.go index 87773541f0..4765c468d8 100644 --- a/src/debug/elf/file.go +++ b/src/debug/elf/file.go @@ -29,17 +29,6 @@ import ( "strings" ) -// seekStart, seekCurrent, seekEnd are copies of -// io.SeekStart, io.SeekCurrent, and io.SeekEnd. -// We can't use the ones from package io because -// we want this code to build with Go 1.4 during -// cmd/dist bootstrap. -const ( - seekStart int = 0 - seekCurrent int = 1 - seekEnd int = 2 -) - // TODO: error reporting detail /* @@ -332,7 +321,7 @@ func NewFile(r io.ReaderAt) (*File, error) { switch f.Class { case ELFCLASS32: hdr := new(Header32) - sr.Seek(0, seekStart) + sr.Seek(0, io.SeekStart) if err := binary.Read(sr, f.ByteOrder, hdr); err != nil { return nil, err } @@ -351,7 +340,7 @@ func NewFile(r io.ReaderAt) (*File, error) { shstrndx = int(hdr.Shstrndx) case ELFCLASS64: hdr := new(Header64) - sr.Seek(0, seekStart) + sr.Seek(0, io.SeekStart) if err := binary.Read(sr, f.ByteOrder, hdr); err != nil { return nil, err } @@ -402,7 +391,7 @@ func NewFile(r io.ReaderAt) (*File, error) { f.Progs = make([]*Prog, phnum) for i := 0; i < phnum; i++ { off := phoff + int64(i)*int64(phentsize) - sr.Seek(off, seekStart) + sr.Seek(off, io.SeekStart) p := new(Prog) switch f.Class { case ELFCLASS32: @@ -453,7 +442,7 @@ func NewFile(r io.ReaderAt) (*File, error) { // header at index 0. if shoff > 0 && shnum == 0 { var typ, link uint32 - sr.Seek(shoff, seekStart) + sr.Seek(shoff, io.SeekStart) switch f.Class { case ELFCLASS32: sh := new(Section32) @@ -506,7 +495,7 @@ func NewFile(r io.ReaderAt) (*File, error) { names := make([]uint32, 0, c) for i := 0; i < shnum; i++ { off := shoff + int64(i)*int64(shentsize) - sr.Seek(off, seekStart) + sr.Seek(off, io.SeekStart) s := new(Section) switch f.Class { case ELFCLASS32: diff --git a/src/debug/elf/reader.go b/src/debug/elf/reader.go index a45843619e..eab437318d 100644 --- a/src/debug/elf/reader.go +++ b/src/debug/elf/reader.go @@ -63,11 +63,11 @@ func (r *readSeekerFromReader) Read(p []byte) (n int, err error) { func (r *readSeekerFromReader) Seek(offset int64, whence int) (int64, error) { var newOffset int64 switch whence { - case seekStart: + case io.SeekStart: newOffset = offset - case seekCurrent: + case io.SeekCurrent: newOffset = r.offset + offset - case seekEnd: + case io.SeekEnd: newOffset = r.size + offset default: return 0, os.ErrInvalid |