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.

diff --git a/lib/smtp.c b/lib/smtp.c
index 729ee4caa6b54e62e149c3b70e46629e5829f44c..b033edabfcf8f42e6f9b10063f11dbfe2c09655e 100644 (file)
--- 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 bf2f90d8d857e6295c43f5bc791d9b3dfda6330f..76a8525a93558365aab1861c1d8211a35d5668af 100644 (file)
--- 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 */
 };