archive/zip, crypto/tls, net/http: Fix print format errors.

All of the errors were located using "go vet ./..." in "src/pkg".

R=golang-dev, iant
CC=golang-dev
https://golang.org/cl/6856056

diff --git a/src/pkg/archive/zip/zip_test.go b/src/pkg/archive/zip/zip_test.go
index 34c899d9f2f00064fd91b9932a5a250bd163ab03..906ded6a918a1ba2d505e9c6bce35cee7fa74af8 100644 (file)
--- a/src/pkg/archive/zip/zip_test.go
+++ b/src/pkg/archive/zip/zip_test.go
@@ -186,12 +186,12 @@ func testInvalidHeader(h *FileHeader, t *testing.T) {
                t.Fatalf("error writing content: %v", err)
        }
        if err := z.Close(); err != nil {
-               t.Fatal("error closing zip writer: %v", err)
+               t.Fatalf("error closing zip writer: %v", err)
        }
 
        b := buf.Bytes()
        if _, err = NewReader(bytes.NewReader(b), int64(len(b))); err != ErrFormat {
-               t.Fatal("got %v, expected ErrFormat", err)
+               t.Fatalf("got %v, expected ErrFormat", err)
        }
 }
 

diff --git a/src/pkg/crypto/tls/prf_test.go b/src/pkg/crypto/tls/prf_test.go
index ce6e36de8a1c1c06f3b8ef7ad050c8bedaa5d347..773a2b2ffc82b8a944fab84053230a02e042ad98 100644 (file)
--- a/src/pkg/crypto/tls/prf_test.go
+++ b/src/pkg/crypto/tls/prf_test.go
@@ -51,7 +51,7 @@ func TestKeysFromPreMasterSecret(t *testing.T) {
 
                masterSecret := masterFromPreMasterSecret(test.version, in, clientRandom, serverRandom)
                if s := hex.EncodeToString(masterSecret); s != test.masterSecret {
-                       t.Errorf("#%d: bad master secret %s, want %s", s, test.masterSecret)
+                       t.Errorf("#%d: bad master secret %s, want %s", i, s, test.masterSecret)
                        continue
                }
 

diff --git a/src/pkg/net/http/transfer_test.go b/src/pkg/net/http/transfer_test.go
index e903c94c1fa7ec18254cb0ac6de88623edee5827..8627a374c8f6ba1cc73bc30c022e888d021139d8 100644 (file)
--- a/src/pkg/net/http/transfer_test.go
+++ b/src/pkg/net/http/transfer_test.go
@@ -20,13 +20,13 @@ func TestBodyReadBadTrailer(t *testing.T) {
        n, err := b.Read(buf[:3])
        got := string(buf[:n])
        if got != "foo" || err != nil {
-               t.Fatalf(`first Read = %n (%q), %v; want 3 ("foo")`, n, got, err)
+               t.Fatalf(`first Read = %d (%q), %v; want 3 ("foo")`, n, got, err)
        }
 
        n, err = b.Read(buf[:])
        got = string(buf[:n])
        if got != "bar" || err != nil {
-               t.Fatalf(`second Read = %n (%q), %v; want 3 ("bar")`, n, got, err)
+               t.Fatalf(`second Read = %d (%q), %v; want 3 ("bar")`, n, got, err)
        }
 
        n, err = b.Read(buf[:])