Do not break out of a switch, use return.

diff --git a/pop3/conn.go b/pop3/conn.go
index 55fc01a3e94ca0d04952e7a2a87bc4131f908a76..5071e78817f5f4d6c09aedd7f922297a4e421429 100644 (file)
--- a/pop3/conn.go
+++ b/pop3/conn.go
@@ -56,7 +56,7 @@ func AcceptConnection(netConn net.Conn, po PostOffice, log zap.Logger) {
                if err != nil {
                        conn.log.Error("ReadLine()", zap.Error(err))
                        conn.tp.Close()
-                       break
+                       return
                }
 
                var cmd string
@@ -68,7 +68,7 @@ func AcceptConnection(netConn net.Conn, po PostOffice, log zap.Logger) {
                switch strings.ToUpper(cmd) {
                case "QUIT":
                        conn.doQUIT()
-                       break
+                       return
                case "USER":
                        conn.doUSER()
                case "PASS":

diff --git a/smtp/conn.go b/smtp/conn.go
index 8b4f1247ea7d6fec6d5b583174f990b1ca2f3b10..0eb3bc9b8472be12f5acfa143590f55730325f15 100644 (file)
--- a/smtp/conn.go
+++ b/smtp/conn.go
@@ -62,7 +62,7 @@ func AcceptConnection(netConn net.Conn, server Server, log zap.Logger) {
                if err != nil {
                        conn.log.Error("ReadLine()", zap.Error(err))
                        conn.tp.Close()
-                       break
+                       return
                }
 
                conn.log.Info("ReadLine()", zap.String("line", conn.line))
@@ -77,7 +77,7 @@ func AcceptConnection(netConn net.Conn, server Server, log zap.Logger) {
                case "QUIT":
                        conn.writeReply(221, "Goodbye")
                        conn.tp.Close()
-                       break
+                       return
                case "HELO":
                        conn.esmtp = false
                        fallthrough