Commit 73bac041 authored by Austin Clements's avatar Austin Clements

Fix declared and not used errors in old sym package (ogle

hasn't been ported to the new sym package yet)

R=rsc
APPROVED=rsc
DELTA=9  (0 added, 1 deleted, 8 changed)
OCL=34851
CL=34962
parent f0964a54
...@@ -84,7 +84,7 @@ func (r *binaryReader) Error() os.Error { ...@@ -84,7 +84,7 @@ func (r *binaryReader) Error() os.Error {
func (r *binaryReader) ReadUint8() uint8 { func (r *binaryReader) ReadUint8() uint8 {
var buf [1]byte; var buf [1]byte;
n, err := io.ReadFull(r.Reader, &buf); _, err := io.ReadFull(r.Reader, &buf);
if r.err == nil && err != nil { if r.err == nil && err != nil {
r.err = err; r.err = err;
} }
...@@ -93,7 +93,7 @@ func (r *binaryReader) ReadUint8() uint8 { ...@@ -93,7 +93,7 @@ func (r *binaryReader) ReadUint8() uint8 {
func (r *binaryReader) ReadUint16() uint16 { func (r *binaryReader) ReadUint16() uint16 {
var buf [2]byte; var buf [2]byte;
n, err := io.ReadFull(r.Reader, &buf); _, err := io.ReadFull(r.Reader, &buf);
if r.err == nil && err != nil { if r.err == nil && err != nil {
r.err = err; r.err = err;
} }
...@@ -102,7 +102,7 @@ func (r *binaryReader) ReadUint16() uint16 { ...@@ -102,7 +102,7 @@ func (r *binaryReader) ReadUint16() uint16 {
func (r *binaryReader) ReadUint32() uint32 { func (r *binaryReader) ReadUint32() uint32 {
var buf [4]byte; var buf [4]byte;
n, err := io.ReadFull(r.Reader, &buf); _, err := io.ReadFull(r.Reader, &buf);
if r.err == nil && err != nil { if r.err == nil && err != nil {
r.err = err; r.err = err;
} }
...@@ -111,7 +111,7 @@ func (r *binaryReader) ReadUint32() uint32 { ...@@ -111,7 +111,7 @@ func (r *binaryReader) ReadUint32() uint32 {
func (r *binaryReader) ReadUint64() uint64 { func (r *binaryReader) ReadUint64() uint64 {
var buf [8]byte; var buf [8]byte;
n, err := io.ReadFull(r.Reader, &buf); _, err := io.ReadFull(r.Reader, &buf);
if r.err == nil && err != nil { if r.err == nil && err != nil {
r.err = err; r.err = err;
} }
......
...@@ -7,7 +7,6 @@ package sym ...@@ -7,7 +7,6 @@ package sym
import ( import (
"fmt"; "fmt";
"io"; "io";
"log";
"os"; "os";
) )
...@@ -62,7 +61,7 @@ func NewElf(r io.ReadSeeker) (*Elf, os.Error) { ...@@ -62,7 +61,7 @@ func NewElf(r io.ReadSeeker) (*Elf, os.Error) {
return nil, err; return nil, err;
} }
start := off; start := off;
n, err := io.ReadFull(r, &ident); _, err = io.ReadFull(r, &ident);
if err != nil { if err != nil {
if err == os.EOF { if err == os.EOF {
err = io.ErrUnexpectedEOF; err = io.ErrUnexpectedEOF;
...@@ -167,7 +166,7 @@ func NewElf(r io.ReadSeeker) (*Elf, os.Error) { ...@@ -167,7 +166,7 @@ func NewElf(r io.ReadSeeker) (*Elf, os.Error) {
return nil, err; return nil, err;
} }
blob := make([]byte, e.Sections[shstrndx].Size); blob := make([]byte, e.Sections[shstrndx].Size);
n, err = io.ReadFull(r, blob); _, err = io.ReadFull(r, blob);
for i, s := range e.Sections { for i, s := range e.Sections {
var ok bool; var ok bool;
......
...@@ -646,12 +646,12 @@ func (lt *lineTable) slice(pc uint64) *lineTable { ...@@ -646,12 +646,12 @@ func (lt *lineTable) slice(pc uint64) *lineTable {
} }
func (lt *lineTable) alineFromPC(targetPC uint64) int { func (lt *lineTable) alineFromPC(targetPC uint64) int {
_1, _2, aline := lt.parse(targetPC, -1); _, _, aline := lt.parse(targetPC, -1);
return aline; return aline;
} }
func (lt *lineTable) pcFromAline(aline int, maxPC uint64) uint64 { func (lt *lineTable) pcFromAline(aline int, maxPC uint64) uint64 {
_1, pc, line := lt.parse(maxPC, aline); _, pc, line := lt.parse(maxPC, aline);
if line != aline { if line != aline {
// Never found aline // Never found aline
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment