From: Robin Eklind <r.eklind.87@gmail.com>
Date: Sat, 17 Nov 2012 01:24:43 +0000 (-0800)
Subject: archive/zip, crypto/tls, net/http: Fix print format errors.
X-Git-Tag: go1.1rc2~1852
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=4f250132f734f3686e1bff3b632e4598a82931a8;p=gostls13.git

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 34c899d9f2..906ded6a91 100644
--- 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 ce6e36de8a..773a2b2ffc 100644
--- 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 e903c94c1f..8627a374c8 100644
--- 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[:])