cmd/internal: C->Go printf cleanup

Change-Id: I1cf94377c613fb51ae77f4fe1e3439268b1606a9
Reviewed-on: https://go-review.googlesource.com/9161
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/cmd/internal/gc/lex.go b/src/cmd/internal/gc/lex.go
index 3ff550131b84101c8fb201af53f0b429c5bc9c4c..fc2963f8a3db7c87a1a8fe1473858facc91f4890 100644 (file)
--- a/src/cmd/internal/gc/lex.go
+++ b/src/cmd/internal/gc/lex.go
@@ -2424,16 +2424,13 @@ var lexn = []struct {
        {LVAR, "VAR"},
 }
 
-var lexname_buf string
-
 func lexname(lex int) string {
        for i := 0; i < len(lexn); i++ {
                if lexn[i].lex == lex {
                        return lexn[i].name
                }
        }
-       lexname_buf = fmt.Sprintf("LEX-%d", lex)
-       return lexname_buf
+       return fmt.Sprintf("LEX-%d", lex)
 }
 
 var yytfix = []struct {

diff --git a/src/cmd/internal/gc/typecheck.go b/src/cmd/internal/gc/typecheck.go
index df4f9ea2cfd1a9406849cbc46a113582c05f6f08..4823b44e1c7203af2ef10e346c23f5f4a6047ca6 100644 (file)
--- a/src/cmd/internal/gc/typecheck.go
+++ b/src/cmd/internal/gc/typecheck.go
@@ -75,8 +75,6 @@ var _typekind = []string{
        TIDEAL:      "untyped number",
 }
 
-var typekind_buf string
-
 func typekind(t *Type) string {
        if Isslice(t) {
                return "slice"
@@ -88,8 +86,7 @@ func typekind(t *Type) string {
                        return s
                }
        }
-       typekind_buf = fmt.Sprintf("etype=%d", et)
-       return typekind_buf
+       return fmt.Sprintf("etype=%d", et)
 }
 
 /*

diff --git a/src/cmd/internal/ld/sym.go b/src/cmd/internal/ld/sym.go
index d873d367cf2132b6c9312e6d54ab31d55b3a03d5..652109d3e370cd322d482c63ec7af0b67a22809e 100644 (file)
--- a/src/cmd/internal/ld/sym.go
+++ b/src/cmd/internal/ld/sym.go
@@ -33,10 +33,10 @@ package ld
 
 import (
        "cmd/internal/obj"
-       "fmt"
        "log"
        "os"
        "path/filepath"
+       "strconv"
 )
 
 func yy_isalpha(c int) bool {
@@ -208,16 +208,13 @@ func Linkrlookup(ctxt *Link, name string, v int) *LSym {
        return _lookup(ctxt, name, v, 0)
 }
 
-var headstr_buf string
-
 func Headstr(v int) string {
        for i := 0; i < len(headers); i++ {
                if v == headers[i].val {
                        return headers[i].name
                }
        }
-       headstr_buf = fmt.Sprintf("%d", v)
-       return headstr_buf
+       return strconv.Itoa(v)
 }
 
 func headtype(name string) int {

diff --git a/src/cmd/internal/obj/flag.go b/src/cmd/internal/obj/flag.go
index 37594372f8a5250d77d4dda968a1a603d7aa8d99..0664f5cf8ed3338c69c2e1c864dddb45930e6006 100644 (file)
--- a/src/cmd/internal/obj/flag.go
+++ b/src/cmd/internal/obj/flag.go
@@ -93,7 +93,7 @@ func (i *int32Value) Set(s string) error {
 
 func (i *int32Value) Get() interface{} { return int32(*i) }
 
-func (i *int32Value) String() string { return fmt.Sprintf("%v", *i) }
+func (i *int32Value) String() string { return fmt.Sprint(*i) }
 
 type fn0 func()
 

diff --git a/src/cmd/internal/obj/util.go b/src/cmd/internal/obj/util.go
index f76c9362bde596af1fc04eaa9a0716ca82abba3f..189f9611ce975ddb5b0ae9d61d983536cbfcbf92 100644 (file)
--- a/src/cmd/internal/obj/util.go
+++ b/src/cmd/internal/obj/util.go
@@ -379,7 +379,7 @@ func Dconv(p *Prog, a *Addr) string {
                        break
                }
 
-               str = fmt.Sprintf("%v", Rconv(int(a.Reg)))
+               str = Rconv(int(a.Reg))
                if a.Name != TYPE_NONE || a.Sym != nil {
                        str = fmt.Sprintf("%v(%v)(REG)", Mconv(a), Rconv(int(a.Reg)))
                }
@@ -388,9 +388,9 @@ func Dconv(p *Prog, a *Addr) string {
                if a.Sym != nil {
                        str = fmt.Sprintf("%s(SB)", a.Sym.Name)
                } else if p != nil && p.Pcond != nil {
-                       str = fmt.Sprintf("%d", p.Pcond.Pc)
+                       str = fmt.Sprint(p.Pcond.Pc)
                } else if a.Val != nil {
-                       str = fmt.Sprintf("%d", a.Val.(*Prog).Pc)
+                       str = fmt.Sprint(a.Val.(*Prog).Pc)
                } else {
                        str = fmt.Sprintf("%d(PC)", a.Offset)
                }
@@ -467,7 +467,7 @@ func Mconv(a *Addr) string {
        case NAME_NONE:
                switch {
                case a.Reg == REG_NONE:
-                       str = fmt.Sprintf("%d", a.Offset)
+                       str = fmt.Sprint(a.Offset)
                case a.Offset == 0:
                        str = fmt.Sprintf("(%v)", Rconv(int(a.Reg)))
                case a.Offset != 0: