From e621a5f6ea12266feb62531099f0c8cf763eb68f Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Tue, 16 Apr 2013 19:32:55 +0100 Subject: smtp: Moved smtp_rcpt_to() to be with the other perform functions --- lib/smtp.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/lib/smtp.c b/lib/smtp.c index e945b41e1..fd0b746d9 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -569,6 +569,27 @@ static CURLcode smtp_mail(struct connectdata *conn) return result; } +static CURLcode smtp_rcpt_to(struct connectdata *conn) +{ + CURLcode result = CURLE_OK; + struct SessionHandle *data = conn->data; + struct SMTP *smtp = data->state.proto.smtp; + + /* Send the RCPT TO command */ + if(smtp->rcpt) { + if(smtp->rcpt->data[0] == '<') + result = Curl_pp_sendf(&conn->proto.smtpc.pp, "RCPT TO:%s", + smtp->rcpt->data); + else + result = Curl_pp_sendf(&conn->proto.smtpc.pp, "RCPT TO:<%s>", + smtp->rcpt->data); + if(!result) + state(conn, SMTP_RCPT); + } + + return result; +} + /* For the initial server greeting */ static CURLcode smtp_state_servergreet_resp(struct connectdata *conn, int smtpcode, @@ -1006,27 +1027,6 @@ static CURLcode smtp_state_auth_final_resp(struct connectdata *conn, return result; } -static CURLcode smtp_rcpt_to(struct connectdata *conn) -{ - CURLcode result = CURLE_OK; - struct SessionHandle *data = conn->data; - struct SMTP *smtp = data->state.proto.smtp; - - /* Send the RCPT TO command */ - if(smtp->rcpt) { - if(smtp->rcpt->data[0] == '<') - result = Curl_pp_sendf(&conn->proto.smtpc.pp, "RCPT TO:%s", - smtp->rcpt->data); - else - result = Curl_pp_sendf(&conn->proto.smtpc.pp, "RCPT TO:<%s>", - smtp->rcpt->data); - if(!result) - state(conn, SMTP_RCPT); - } - - return result; -} - /* For MAIL responses */ static CURLcode smtp_state_mail_resp(struct connectdata *conn, int smtpcode, smtpstate instate) -- cgit v1.2.3