From: Gustavo Niemeyer <gustavo@niemeyer.net>
Date: Tue, 12 Apr 2011 14:48:05 +0000 (-0300)
Subject: openpgp: Fix improper := shadowing
X-Git-Tag: weekly.2011-04-13~34
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=c34aadf0636b4b368358df29bc43786db882172f;p=gostls13.git

openpgp: Fix improper := shadowing

R=golang-dev, agl1, jnml
CC=golang-dev
https://golang.org/cl/4381058
---

diff --git a/src/pkg/crypto/openpgp/armor/encode.go b/src/pkg/crypto/openpgp/armor/encode.go
index 0f7de02412..99dee375ef 100644
--- a/src/pkg/crypto/openpgp/armor/encode.go
+++ b/src/pkg/crypto/openpgp/armor/encode.go
@@ -18,9 +18,9 @@ var armorEndOfLineOut = []byte("-----\n")
 // writeSlices writes its arguments to the given Writer.
 func writeSlices(out io.Writer, slices ...[]byte) (err os.Error) {
 	for _, s := range slices {
-		_, err := out.Write(s)
+		_, err = out.Write(s)
 		if err != nil {
-			return
+			return err
 		}
 	}
 	return