aboutsummaryrefslogtreecommitdiff
path: root/libgo/go/crypto
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2011-10-24 19:44:18 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2011-10-24 19:44:18 +0000
commit980889d81482ecc88280262cdd101471f8e3c511 (patch)
tree3a7c7b7ffcde861a01beb3e7d1625af06e68d738 /libgo/go/crypto
parentd41c3b89475f0bcb0ed03f78d7ab2d4c9f94844a (diff)
downloadgcc-980889d81482ecc88280262cdd101471f8e3c511.zip
gcc-980889d81482ecc88280262cdd101471f8e3c511.tar.gz
gcc-980889d81482ecc88280262cdd101471f8e3c511.tar.bz2
Error if naked return when result variables are shadowed.
From-SVN: r180401
Diffstat (limited to 'libgo/go/crypto')
-rw-r--r--libgo/go/crypto/openpgp/s2k/s2k.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/libgo/go/crypto/openpgp/s2k/s2k.go b/libgo/go/crypto/openpgp/s2k/s2k.go
index da926a7..013b15c 100644
--- a/libgo/go/crypto/openpgp/s2k/s2k.go
+++ b/libgo/go/crypto/openpgp/s2k/s2k.go
@@ -100,7 +100,7 @@ func Parse(r io.Reader) (f func(out, in []byte), err os.Error) {
}
return f, nil
case 2:
- _, err := io.ReadFull(r, buf[:8])
+ _, err = io.ReadFull(r, buf[:8])
if err != nil {
return
}
@@ -109,7 +109,7 @@ func Parse(r io.Reader) (f func(out, in []byte), err os.Error) {
}
return f, nil
case 3:
- _, err := io.ReadFull(r, buf[:9])
+ _, err = io.ReadFull(r, buf[:9])
if err != nil {
return
}