*: fix nakedret lint

Signed-off-by: Wei Fu <fuweid89@gmail.com>

client/pkg/transport/keepalive_listener.go

@@ -101,10 +101,10 @@ type tlsKeepaliveListener struct {
 
 // Accept waits for and returns the next incoming TLS connection.
 // The returned connection c is a *tls.Conn.
-func (l *tlsKeepaliveListener) Accept() (c net.Conn, err error) {
-	c, err = l.Listener.Accept()
+func (l *tlsKeepaliveListener) Accept() (net.Conn, error) {
+	c, err := l.Listener.Accept()
 	if err != nil {
-		return
+		return nil, err
 	}
 
 	c = tls.Server(c, l.config)

client/pkg/transport/listener.go

@@ -103,14 +103,17 @@ func newListener(addr, scheme string, opts ...ListenerOption) (net.Listener, err
 	return wrapTLS(scheme, lnOpts.tlsInfo, lnOpts.Listener)
 }
 
-func newKeepAliveListener(cfg *net.ListenConfig, addr string) (ln net.Listener, err error) {
+func newKeepAliveListener(cfg *net.ListenConfig, addr string) (net.Listener, error) {
+	var ln net.Listener
+	var err error
+
 	if cfg != nil {
 		ln, err = cfg.Listen(context.TODO(), "tcp", addr)
 	} else {
 		ln, err = net.Listen("tcp", addr)
 	}
 	if err != nil {
-		return
+		return nil, err
 	}
 
 	return NewKeepAliveListener(ln, "tcp", nil)
@@ -204,16 +207,18 @@ func (info TLSInfo) Empty() bool {
 	return info.CertFile == "" && info.KeyFile == ""
 }
 
-func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertValidity uint, additionalUsages ...x509.ExtKeyUsage) (info TLSInfo, err error) {
+func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertValidity uint, additionalUsages ...x509.ExtKeyUsage) (TLSInfo, error) {
 	verify.Assert(lg != nil, "nil log isn't allowed")
-	info.Logger = lg
+
+	var err error
+	info := TLSInfo{Logger: lg}
 	if selfSignedCertValidity == 0 {
 		err = errors.New("selfSignedCertValidity is invalid,it should be greater than 0")
 		info.Logger.Warn(
 			"cannot generate cert",
 			zap.Error(err),
 		)
-		return
+		return info, err
 	}
 	err = fileutil.TouchDirAll(lg, dirpath)
 	if err != nil {
@@ -223,16 +228,16 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali
 				zap.Error(err),
 			)
 		}
-		return
+		return info, err
 	}
 
 	certPath, err := filepath.Abs(filepath.Join(dirpath, "cert.pem"))
 	if err != nil {
-		return
+		return info, err
 	}
 	keyPath, err := filepath.Abs(filepath.Join(dirpath, "key.pem"))
 	if err != nil {
-		return
+		return info, err
 	}
 	_, errcert := os.Stat(certPath)
 	_, errkey := os.Stat(keyPath)
@@ -242,7 +247,7 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali
 		info.ClientCertFile = certPath
 		info.ClientKeyFile = keyPath
 		info.selfCert = true
-		return
+		return info, err
 	}
 
 	serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128)
@@ -254,7 +259,7 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali
 				zap.Error(err),
 			)
 		}
-		return
+		return info, err
 	}
 
 	tmpl := x509.Certificate{
@@ -292,7 +297,7 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali
 				zap.Error(err),
 			)
 		}
-		return
+		return info, err
 	}
 
 	derBytes, err := x509.CreateCertificate(rand.Reader, &tmpl, &tmpl, &priv.PublicKey, priv)
@@ -303,7 +308,7 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali
 				zap.Error(err),
 			)
 		}
-		return
+		return info, err
 	}
 
 	certOut, err := os.Create(certPath)
@@ -313,7 +318,7 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali
 			zap.String("path", certPath),
 			zap.Error(err),
 		)
-		return
+		return info, err
 	}
 	pem.Encode(certOut, &pem.Block{Type: "CERTIFICATE", Bytes: derBytes})
 	certOut.Close()
@@ -323,7 +328,7 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali
 
 	b, err := x509.MarshalECPrivateKey(priv)
 	if err != nil {
-		return
+		return info, err
 	}
 	keyOut, err := os.OpenFile(keyPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
 	if err != nil {
@@ -334,7 +339,7 @@ func SelfCert(lg *zap.Logger, dirpath string, hosts []string, selfSignedCertVali
 				zap.Error(err),
 			)
 		}
-		return
+		return info, err
 	}
 	pem.Encode(keyOut, &pem.Block{Type: "EC PRIVATE KEY", Bytes: b})
 	keyOut.Close()