From: Christopher Wedgwood <cw@f00f.org>
Date: Tue, 1 Dec 2009 23:54:49 +0000 (-0800)
Subject: Explicitly return values where it's shadowing the parameter.
X-Git-Tag: weekly.2009-12-07~85
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=4f6dbc6901d457037bd4980b77e9bcd3bd67b911;p=gostls13.git

Explicitly return values where it's shadowing the parameter.

Bad returns noticed by "Devon H. O'Dell" <devon.odell@gmail.com>.

Resolves Issue 360.

R=rsc, dho, agl, agl1
CC=ukai
https://golang.org/cl/163055
---

diff --git a/src/pkg/websocket/websocket.go b/src/pkg/websocket/websocket.go
index 0fd32cd4cd..373961d570 100644
--- a/src/pkg/websocket/websocket.go
+++ b/src/pkg/websocket/websocket.go
@@ -52,14 +52,14 @@ func (ws *Conn) Read(msg []byte) (n int, err os.Error) {
 	for {
 		frameByte, err := ws.buf.ReadByte();
 		if err != nil {
-			return
+			return n, err
 		}
 		if (frameByte & 0x80) == 0x80 {
 			length := 0;
 			for {
 				c, err := ws.buf.ReadByte();
 				if err != nil {
-					return
+					return n, err
 				}
 				if (c & 0x80) == 0x80 {
 					length = length*128 + int(c&0x7f)
@@ -70,7 +70,7 @@ func (ws *Conn) Read(msg []byte) (n int, err os.Error) {
 			for length > 0 {
 				_, err := ws.buf.ReadByte();
 				if err != nil {
-					return
+					return n, err
 				}
 				length--;
 			}
@@ -78,10 +78,10 @@ func (ws *Conn) Read(msg []byte) (n int, err os.Error) {
 			for {
 				c, err := ws.buf.ReadByte();
 				if err != nil {
-					return
+					return n, err
 				}
 				if c == '\xff' {
-					return
+					return n, err
 				}
 				if frameByte == 0 {
 					if n+1 <= cap(msg) {
@@ -91,13 +91,13 @@ func (ws *Conn) Read(msg []byte) (n int, err os.Error) {
 					n++;
 				}
 				if n >= cap(msg) {
-					err = os.E2BIG;
-					return;
+					return n, os.E2BIG
 				}
 			}
 		}
 	}
-	return;
+
+	panic("unreachable");
 }
 
 func (ws *Conn) Write(msg []byte) (n int, err os.Error) {