moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

pop3: Another small code tidy up 

Missed some comments that we identified during the SMTP tidy up earlier.
This commit is contained in:
Steve Holme 2012-06-05 13:49:50 +01:00
parent 7157363ab4
commit 0f3c330ad8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/pop3.c
View File

@ -505,6 +505,7 @@ static CURLcode pop3_state_starttls_resp(struct connectdata *conn,
result = pop3_state_capa(conn); result = pop3_state_capa(conn);
} }
else { else {
/* End of connect phase */
state(conn, POP3_STOP); state(conn, POP3_STOP);
} }
} }
@ -582,11 +583,11 @@ static CURLcode pop3_state_auth_login_resp(struct connectdata *conn,
result = CURLE_LOGIN_DENIED; result = CURLE_LOGIN_DENIED;
} }
else { else {
/* Create the login message */ /* Create the user message */
result = Curl_sasl_create_login_message(data, conn->user, result = Curl_sasl_create_login_message(data, conn->user,
&authuser, &len); &authuser, &len);
/* Send the login */ /* Send the user */
if(!result) { if(!result) {
if(authuser) { if(authuser) {
result = Curl_pp_sendf(&conn->proto.pop3c.pp, "%s", 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; result = CURLE_LOGIN_DENIED;
} }
else { else {
/* Create the type-1 message */
result = Curl_sasl_create_ntlm_type1_message(conn->user, conn->passwd, result = Curl_sasl_create_ntlm_type1_message(conn->user, conn->passwd,
&conn->ntlm, &conn->ntlm,
&type1msg, &len); &type1msg, &len);
/* Send the message */
if(!result) { if(!result) {
if(type1msg) { if(type1msg) {
result = Curl_pp_sendf(&conn->proto.pop3c.pp, "%s", 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; 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, static CURLcode pop3_state_auth_ntlm_type2msg_resp(struct connectdata *conn,
int pop3code, int pop3code,
pop3state instate) pop3state instate)
@ -818,6 +821,7 @@ static CURLcode pop3_state_auth_ntlm_type2msg_resp(struct connectdata *conn,
conn->user, conn->passwd, conn->user, conn->passwd,
&conn->ntlm, &conn->ntlm,
&type3msg, &len); &type3msg, &len);
/* Send the message */ /* Send the message */
if(!result) { if(!result) {
if(type3msg) { if(type3msg) {
@ -904,7 +908,7 @@ static CURLcode pop3_state_pass_resp(struct connectdata *conn,
return result; return result;
} }
/* For the command response */ /* For command responses */
static CURLcode pop3_state_command_resp(struct connectdata *conn, static CURLcode pop3_state_command_resp(struct connectdata *conn,
int pop3code, int pop3code,
pop3state instate) pop3state instate)