From: Steve Holme <steve_holme@hotmail.com>
Date: Tue, 5 Jun 2012 12:49:50 +0000 (+0100)
Subject: pop3: Another small code tidy up
X-Git-Tag: curl-7_27_0~271
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f3c330ad8c78b1cdcbe9562c2091841aa569d41;p=curl

pop3: Another small code tidy up

Missed some comments that we identified during the SMTP tidy up earlier.
---

diff --git a/lib/pop3.c b/lib/pop3.c
index 2f67f8f9e..a9463241e 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -505,6 +505,7 @@ static CURLcode pop3_state_starttls_resp(struct connectdata *conn,
       result = pop3_state_capa(conn);
     }
     else {
+      /* End of connect phase */
       state(conn, POP3_STOP);
     }
   }
@@ -582,11 +583,11 @@ static CURLcode pop3_state_auth_login_resp(struct connectdata *conn,
     result = CURLE_LOGIN_DENIED;
   }
   else {
-    /* Create the login message */
+    /* Create the user message */
     result = Curl_sasl_create_login_message(data, conn->user,
                                             &authuser, &len);
 
-    /* Send the login */
+    /* Send the user */
     if(!result) {
       if(authuser) {
         result = Curl_pp_sendf(&conn->proto.pop3c.pp, "%s", authuser);
@@ -776,10 +777,12 @@ static CURLcode pop3_state_auth_ntlm_resp(struct connectdata *conn,
     result = CURLE_LOGIN_DENIED;
   }
   else {
+    /* Create the type-1 message */
     result = Curl_sasl_create_ntlm_type1_message(conn->user, conn->passwd,
                                                  &conn->ntlm,
                                                  &type1msg, &len);
 
+    /* Send the message */
     if(!result) {
       if(type1msg) {
         result = Curl_pp_sendf(&conn->proto.pop3c.pp, "%s", type1msg);
@@ -795,7 +798,7 @@ static CURLcode pop3_state_auth_ntlm_resp(struct connectdata *conn,
   return result;
 }
 
-/* For the NTLM type-2 response (sent in reponse to our type-1 message) */
+/* For NTLM type-2 responses (sent in reponse to our type-1 message) */
 static CURLcode pop3_state_auth_ntlm_type2msg_resp(struct connectdata *conn,
                                                    int pop3code,
                                                    pop3state instate)
@@ -818,6 +821,7 @@ static CURLcode pop3_state_auth_ntlm_type2msg_resp(struct connectdata *conn,
                                                  conn->user, conn->passwd,
                                                  &conn->ntlm,
                                                  &type3msg, &len);
+
     /* Send the message */
     if(!result) {
       if(type3msg) {
@@ -904,7 +908,7 @@ static CURLcode pop3_state_pass_resp(struct connectdata *conn,
   return result;
 }
 
-/* For the command response */
+/* For command responses */
 static CURLcode pop3_state_command_resp(struct connectdata *conn,
                                         int pop3code,
                                         pop3state instate)