mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmd/link/internal/ld: fix extra arguments Errorf 

lib.go:1309
lib.go:1313
lib.go:1317
lib.go:1325

Change-Id: Ic3d3282d836c28f8bdeb5ce52fb7c018450871b9
Reviewed-on: https://go-review.googlesource.com/16473
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Quentin Perez 2015-10-30 16:25:29 +01:00 committed by Brad Fitzpatrick
parent c229d2fdc6
commit 70119accdf
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cmd/link/internal/ld/lib.go
View File

@ -1306,23 +1306,23 @@ func readnote(f *elf.File, name []byte, typ int32) ([]byte, error) {
if err == io.EOF { if err == io.EOF {
break break
} }
return nil, fmt.Errorf("read namesize failed:", err) return nil, fmt.Errorf("read namesize failed: %v", err)
} }
err = binary.Read(r, f.ByteOrder, &descsize) err = binary.Read(r, f.ByteOrder, &descsize)
if err != nil { if err != nil {
return nil, fmt.Errorf("read descsize failed:", err) return nil, fmt.Errorf("read descsize failed: %v", err)
} }
err = binary.Read(r, f.ByteOrder, &noteType) err = binary.Read(r, f.ByteOrder, &noteType)
if err != nil { if err != nil {
return nil, fmt.Errorf("read type failed:", err) return nil, fmt.Errorf("read type failed: %v", err)
} }
noteName, err := readwithpad(r, namesize) noteName, err := readwithpad(r, namesize)
if err != nil { if err != nil {
return nil, fmt.Errorf("read name failed:", err) return nil, fmt.Errorf("read name failed: %v", err)
} }
desc, err := readwithpad(r, descsize) desc, err := readwithpad(r, descsize)
if err != nil { if err != nil {
return nil, fmt.Errorf("read desc failed:", err) return nil, fmt.Errorf("read desc failed: %v", err)
} }
if string(name) == string(noteName) && typ == noteType { if string(name) == string(noteName) && typ == noteType {
return desc, nil return desc, nil