aboutsummaryrefslogtreecommitdiff
path: root/lib/smtp.c
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2013-02-23 20:02:05 +0000
committerSteve Holme <steve_holme@hotmail.com>2013-02-23 20:02:05 +0000
commit7f6c7331b2c061d1761717bcd1595e5941a35072 (patch)
tree49a9535657eb477b7b568df8415689b325593246 /lib/smtp.c
parent0b795db731f7a9ef33d45d2be3fb666dd9813d56 (diff)
email: Additional tidy up of comments following recent changes
Diffstat (limited to 'lib/smtp.c')
-rw-r--r--lib/smtp.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/lib/smtp.c b/lib/smtp.c
index ba219922a..729ee4caa 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -1384,11 +1384,10 @@ static CURLcode smtp_done(struct connectdata *conn, CURLcode status,
(void)premature;
if(!smtp)
- /* When the easy handle is removed from the multi while libcurl is still
- * trying to resolve the host name, it seems that the SMTP struct is not
- * yet initialized, but the removal action calls Curl_done() which calls
- * this function. So we simply return success if no SMTP pointer is set.
- */
+ /* When the easy handle is removed from the multi interface while libcurl
+ is still trying to resolve the host name, the SMTP struct is not yet
+ initialized. However, the removal action calls Curl_done() which in
+ turn calls this function, so we simply return success. */
return CURLE_OK;
if(status) {
@@ -1492,12 +1491,10 @@ static CURLcode smtp_do(struct connectdata *conn, bool *done)
*done = FALSE; /* default to false */
- /*
- Since connections can be re-used between SessionHandles, this might be a
- connection already existing but on a fresh SessionHandle struct so we must
- make sure we have a good 'struct SMTP' to play with. For new connections,
- the struct SMTP is allocated and setup in the smtp_connect() function.
- */
+ /* Since connections can be re-used between SessionHandles, there might be a
+ connection already existing but on a fresh SessionHandle struct. As such
+ we make sure we have a good SMTP struct to play with. For new connections
+ the SMTP struct is allocated and setup in the smtp_connect() function. */
Curl_reset_reqproto(conn);
result = smtp_init(conn);
if(result)
@@ -1520,6 +1517,7 @@ static CURLcode smtp_quit(struct connectdata *conn)
{
CURLcode result = CURLE_OK;
+ /* Send the QUIT command */
result = Curl_pp_sendf(&conn->proto.smtpc.pp, "QUIT");
if(result)
return result;
@@ -1545,7 +1543,7 @@ static CURLcode smtp_disconnect(struct connectdata *conn,
/* We cannot send quit unconditionally. If this connection is stale or
bad in any way, sending quit and waiting around here will make the
- disconnect wait in vain and cause more problems than we need to */
+ disconnect wait in vain and cause more problems than we need to. */
/* The SMTP session may or may not have been allocated/setup at this
point! */