From afad1ce753a108d64747e5d03168ace4b65aa751 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Wed, 27 Feb 2013 21:20:11 +0000 Subject: pop3: Re-factored the final POP3_AUTH constant Changed the final POP3_AUTH constant to POP3_AUTH_FINAL for consistency with the response function. --- lib/pop3.c | 12 ++++++------ lib/pop3.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/pop3.c b/lib/pop3.c index ffccfe0e0..0d463727e 100644 --- a/lib/pop3.c +++ b/lib/pop3.c @@ -676,7 +676,7 @@ static CURLcode pop3_state_auth_plain_resp(struct connectdata *conn, result = Curl_pp_sendf(&conn->proto.pop3c.pp, "%s", plainauth); if(!result) - state(conn, POP3_AUTH); + state(conn, POP3_AUTH_FINAL); } Curl_safefree(plainauth); @@ -750,7 +750,7 @@ static CURLcode pop3_state_auth_login_password_resp(struct connectdata *conn, result = Curl_pp_sendf(&conn->proto.pop3c.pp, "%s", authpasswd); if(!result) - state(conn, POP3_AUTH); + state(conn, POP3_AUTH_FINAL); } Curl_safefree(authpasswd); @@ -805,7 +805,7 @@ static CURLcode pop3_state_auth_cram_resp(struct connectdata *conn, result = Curl_pp_sendf(&conn->proto.pop3c.pp, "%s", rplyb64); if(!result) - state(conn, POP3_AUTH); + state(conn, POP3_AUTH_FINAL); } Curl_safefree(rplyb64); @@ -875,7 +875,7 @@ static CURLcode pop3_state_auth_digest_resp_resp(struct connectdata *conn, result = Curl_pp_sendf(&conn->proto.pop3c.pp, ""); if(!result) - state(conn, POP3_AUTH); + state(conn, POP3_AUTH_FINAL); } return result; @@ -951,7 +951,7 @@ static CURLcode pop3_state_auth_ntlm_type2msg_resp(struct connectdata *conn, result = Curl_pp_sendf(&conn->proto.pop3c.pp, "%s", type3msg); if(!result) - state(conn, POP3_AUTH); + state(conn, POP3_AUTH_FINAL); } Curl_safefree(type3msg); @@ -1215,7 +1215,7 @@ static CURLcode pop3_statemach_act(struct connectdata *conn) break; #endif - case POP3_AUTH: + case POP3_AUTH_FINAL: result = pop3_state_auth_final_resp(conn, pop3code, pop3c->state); break; diff --git a/lib/pop3.h b/lib/pop3.h index 335e67d77..129dffc71 100644 --- a/lib/pop3.h +++ b/lib/pop3.h @@ -43,7 +43,7 @@ typedef enum { POP3_AUTH_DIGESTMD5_RESP, POP3_AUTH_NTLM, POP3_AUTH_NTLM_TYPE2MSG, - POP3_AUTH, + POP3_AUTH_FINAL, POP3_APOP, POP3_USER, POP3_PASS, -- cgit v1.2.3