From: mattyw <gh@mattyw.net>
Date: Thu, 28 Sep 2017 15:12:16 +0000 (-0400)
Subject: net/http: remove unused named return variables
X-Git-Tag: go1.10beta1~434
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=41d860cf0e7cb63003d55839b59949752b7fdecc;p=gostls13.git

net/http: remove unused named return variables

The existing implementation names a c net.Conn return which is
never user. Leaving the returns unamed is marginally clearer.

Change-Id: If9a411c9235b78c116a8ffb21fef71f7a4a4ce8f
Reviewed-on: https://go-review.googlesource.com/66890
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/src/net/http/server.go b/src/net/http/server.go
index 4329e61e60..b59179fb3c 100644
--- a/src/net/http/server.go
+++ b/src/net/http/server.go
@@ -3161,10 +3161,10 @@ type tcpKeepAliveListener struct {
 	*net.TCPListener
 }
 
-func (ln tcpKeepAliveListener) Accept() (c net.Conn, err error) {
+func (ln tcpKeepAliveListener) Accept() (net.Conn, error) {
 	tc, err := ln.AcceptTCP()
 	if err != nil {
-		return
+		return nil, err
 	}
 	tc.SetKeepAlive(true)
 	tc.SetKeepAlivePeriod(3 * time.Minute)