From ed7d438a124a2504f07e19379cc90c45b530a8ea Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Sat, 23 Feb 2013 19:31:59 +0000 Subject: pop3: Introduced a custom SMTP structure for per-request data Created a new SMTP structure and changed the type of the smtp proto variable in connectdata from FTP* to SMTP*. --- lib/smtp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/smtp.c') diff --git a/lib/smtp.c b/lib/smtp.c index 727896e35..6e802b253 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -1091,7 +1091,7 @@ static CURLcode smtp_state_data_resp(struct connectdata *conn, int smtpcode, smtpstate instate) { struct SessionHandle *data = conn->data; - struct FTP *smtp = data->state.proto.smtp; + struct SMTP *smtp = data->state.proto.smtp; (void)instate; /* no use for this yet */ @@ -1280,10 +1280,10 @@ static CURLcode smtp_block_statemach(struct connectdata *conn) static CURLcode smtp_init(struct connectdata *conn) { struct SessionHandle *data = conn->data; - struct FTP *smtp = data->state.proto.smtp; + struct SMTP *smtp = data->state.proto.smtp; if(!smtp) { - smtp = data->state.proto.smtp = calloc(sizeof(struct FTP), 1); + smtp = data->state.proto.smtp = calloc(sizeof(struct SMTP), 1); if(!smtp) return CURLE_OUT_OF_MEMORY; } @@ -1385,7 +1385,7 @@ static CURLcode smtp_done(struct connectdata *conn, CURLcode status, { CURLcode result = CURLE_OK; struct SessionHandle *data = conn->data; - struct FTP *smtp = data->state.proto.smtp; + struct SMTP *smtp = data->state.proto.smtp; ssize_t bytes_written; (void)premature; @@ -1462,7 +1462,7 @@ static CURLcode smtp_perform(struct connectdata *conn, bool *connected, if(conn->data->set.opt_no_body) { /* Requested no body means no transfer */ - struct FTP *smtp = conn->data->state.proto.smtp; + struct SMTP *smtp = conn->data->state.proto.smtp; smtp->transfer = FTPTRANSFER_INFO; } @@ -1574,7 +1574,7 @@ static CURLcode smtp_disconnect(struct connectdata *conn, /* Call this when the DO phase has completed */ static CURLcode smtp_dophase_done(struct connectdata *conn, bool connected) { - struct FTP *smtp = conn->data->state.proto.smtp; + struct SMTP *smtp = conn->data->state.proto.smtp; (void)connected; -- cgit v1.2.3