Skip to content

Commit

Permalink
log.Println lines removed
Browse files Browse the repository at this point in the history
  • Loading branch information
gozeloglu committed Sep 10, 2021
1 parent 3255786 commit f38e413
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 35 deletions.
13 changes: 0 additions & 13 deletions pop3/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package pop3
import (
"crypto/tls"
"fmt"
"log"
"net"
"strings"
)
Expand Down Expand Up @@ -71,15 +70,13 @@ func connectPOP3TLS(addr string, config *tls.Config) (Client, error) {

tlsConn, err := tls.Dial("tcp", addr, config)
if err != nil {
log.Println(err)
return *c, err
}
c.Conn = tlsConn
c.Addr = addr

err = c.readGreetingMsg()
if err != nil {
log.Println(err)
return Client{}, err
}
return *c, nil
Expand All @@ -100,15 +97,13 @@ func connectPOP3(addr string) (Client, error) {

conn, err := net.Dial("tcp", addr)
if err != nil {
log.Println(err)
return *c, err
}
c.Conn = conn
c.Addr = addr

err = c.readGreetingMsg()
if err != nil {
log.Println(err)
return Client{}, err
}

Expand All @@ -130,7 +125,6 @@ func (c *Client) readGreetingMsg() error {

r, err := c.Conn.Read(buf[:])
if err != nil {
log.Println(err)
return err
}
resp := string(buf[:r])
Expand All @@ -139,13 +133,11 @@ func (c *Client) readGreetingMsg() error {
// message, returns an error.
if !c.isAuth(resp) {
e := "not authorized to POP3 server"
log.Println(e)
return fmt.Errorf(e)
}
c.GreetingMsg = resp
c.IsAuthorized = true

log.Println(resp)
return nil
}

Expand Down Expand Up @@ -192,8 +184,6 @@ func (c *Client) quit() (string, error) {
if isQuit(qResp) {
defer c.Conn.Close()
defer c.changeClientState()
log.Println(c.IsAuthorized)
log.Println(c.Addr)
}

return qResp, nil
Expand All @@ -219,7 +209,6 @@ func (c Client) sendQuitCmd() error {
buf := []byte("QUIT\r\n")
_, err := c.Conn.Write(buf)
if err != nil {
log.Println(err)
return err
}
return nil
Expand All @@ -234,11 +223,9 @@ func (c *Client) readQuitResp() (string, error) {
var buf [512]byte
r, err := c.Conn.Read(buf[:])
if err != nil {
log.Printf(err.Error())
return "", err
}
resp := string(buf[:r])
log.Println(resp)
return resp, nil
}

Expand Down
22 changes: 0 additions & 22 deletions pop3/transaction.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package pop3

import (
"log"
"strconv"
)

Expand All @@ -13,7 +12,6 @@ func (c *Client) sendCmd(cmd string) error {
buf := []byte(cmd + "\r\n")
_, err := c.Conn.Write(buf)
if err != nil {
log.Println(err)
return err
}
return nil
Expand All @@ -29,7 +27,6 @@ func (c Client) sendCmdWithArg(cmd string, arg string) error {
buf := []byte(cmd + " " + arg + "\r\n")
_, err := c.Conn.Write(buf[:])
if err != nil {
log.Println(err)
return err
}
return nil
Expand All @@ -44,12 +41,10 @@ func (c *Client) readResp() (string, error) {
var buf [512]byte
r, err := c.Conn.Read(buf[:])
if err != nil {
log.Println(err)
return "", err
}

resp := string(buf[:r])
log.Println(resp)
return resp, nil
}

Expand Down Expand Up @@ -94,13 +89,11 @@ func (c *Client) Stat() (string, error) {
func (c *Client) stat() (string, error) {
err := c.sendCmd("STAT")
if err != nil {
log.Println(err)
return "", err
}

resp, err := c.readResp()
if err != nil {
log.Println(err)
return "", err
}

Expand Down Expand Up @@ -151,7 +144,6 @@ func (c *Client) list(mailNum []int) ([]string, error) {
err = c.sendCmd("LIST")
}
if err != nil {
log.Println(err)
return msgList, err
}

Expand Down Expand Up @@ -192,14 +184,12 @@ func (c *Client) retr(mailNum string) ([]string, error) {
// Send the RETR command
err := c.sendCmdWithArg("RETR", mailNum)
if err != nil {
log.Println(err)
return nil, err
}

// Read the response
retrResp, err := c.readRespMultiLines()
if err != nil {
log.Println(err)
return nil, err
}
return retrResp, nil
Expand Down Expand Up @@ -228,18 +218,14 @@ func (c *Client) dele(mailNum string) (string, error) {
cmd := "DELE"
err := c.sendCmdWithArg(cmd, mailNum)
if err != nil {
log.Println(err)
return "", err
}

// Read the DELE command's response.
deleResp, err := c.readResp()
if err != nil {
log.Println(err)
return "", err
}

log.Println(deleResp)
return deleResp, nil
}

Expand All @@ -257,12 +243,10 @@ func (c *Client) Noop() (string, error) {
func (c *Client) noop() (string, error) {
err := c.sendCmd("NOOP")
if err != nil {
log.Println(err)
return "", err
}
noop, err := c.readResp()
if err != nil {
log.Println(err)
return "", err
}
return noop, nil
Expand All @@ -287,17 +271,14 @@ func (c *Client) Rset() (string, error) {
func (c Client) rset() (string, error) {
err := c.sendCmd("RSET")
if err != nil {
log.Println(err)
return "", err
}

resp, err := c.readResp()
if err != nil {
log.Println(err)
return "", err
}

log.Println(resp)
return resp, nil
}

Expand Down Expand Up @@ -340,18 +321,15 @@ func (c *Client) user(name string) (string, error) {
cmd := "USER"
err := c.sendCmdWithArg(cmd, name)
if err != nil {
log.Println(err)
return "", err
}

// Read server response
userResp, err := c.readResp()
if err != nil {
log.Println(err)
return "", nil
}

log.Println(userResp)
return userResp, nil
}

Expand Down

0 comments on commit f38e413

Please sign in to comment.