From 9d45391347e3fe3c7f65aa9769b2df68028b50cc Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Mon, 25 Feb 2013 22:28:14 +0000 Subject: smtp: Removed bytecountp from the per-request structure Removed this pointer to a downloaded bytes counter because it was set in smtp_init() to point to the same variable the transfer functions keep the count in (k->bytecount), effectively making the code in transfer.c "*k->bytecountp = k->bytecount" a no-op. --- lib/smtp.c | 6 +----- lib/smtp.h | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/smtp.c b/lib/smtp.c index 729ee4caa..b033edabf 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -1091,7 +1091,6 @@ static CURLcode smtp_state_data_resp(struct connectdata *conn, int smtpcode, smtpstate instate) { struct SessionHandle *data = conn->data; - struct SMTP *smtp = data->state.proto.smtp; (void)instate; /* no use for this yet */ @@ -1102,7 +1101,7 @@ static CURLcode smtp_state_data_resp(struct connectdata *conn, int smtpcode, /* SMTP upload */ Curl_setup_transfer(conn, -1, -1, FALSE, NULL, /* no download */ - FIRSTSOCKET, smtp->bytecountp); + FIRSTSOCKET, NULL); /* End of do phase */ state(conn, SMTP_STOP); @@ -1288,9 +1287,6 @@ static CURLcode smtp_init(struct connectdata *conn) return CURLE_OUT_OF_MEMORY; } - /* Get some initial data into the smtp struct */ - smtp->bytecountp = &data->req.bytecount; - return CURLE_OK; } diff --git a/lib/smtp.h b/lib/smtp.h index bf2f90d8d..76a8525a9 100644 --- a/lib/smtp.h +++ b/lib/smtp.h @@ -58,7 +58,6 @@ typedef enum { perhaps the SessionHandle is changed between the times the connection is used. */ struct SMTP { - curl_off_t *bytecountp; curl_pp_transfer transfer; struct curl_slist *rcpt; /* Recipient list */ }; -- cgit v1.2.1