From: Steve Holme <steve_holme@hotmail.com>
Date: Mon, 25 Feb 2013 21:46:37 +0000 (+0000)
Subject: pop3: Removed bytecountp from the per-request structure
X-Git-Tag: curl-7_30_0~263
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a390454728e5fc19c66e72565c1f3eb720e07efc;p=thirdparty%2Fcurl.git

pop3: Removed bytecountp from the per-request structure

Removed this pointer to a downloaded bytes counter because it was set in
pop3_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/pop3.c b/lib/pop3.c
index acdb65f0d1..23d7e97b29 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -1115,7 +1115,7 @@ static CURLcode pop3_state_command_resp(struct connectdata *conn,
   pop3c->strip = 2;
 
   /* POP3 download */
-  Curl_setup_transfer(conn, FIRSTSOCKET, -1, FALSE, pop3->bytecountp,
+  Curl_setup_transfer(conn, FIRSTSOCKET, -1, FALSE, NULL,
                       -1, NULL); /* no upload here */
 
   if(pp->cache) {
@@ -1294,9 +1294,6 @@ static CURLcode pop3_init(struct connectdata *conn)
       return CURLE_OUT_OF_MEMORY;
   }
 
-  /* Get some initial data into the pop3 struct */
-  pop3->bytecountp = &data->req.bytecount;
-
   return CURLE_OK;
 }
 
diff --git a/lib/pop3.h b/lib/pop3.h
index 459a03d7ad..4277535aed 100644
--- a/lib/pop3.h
+++ b/lib/pop3.h
@@ -57,7 +57,6 @@ typedef enum {
    perhaps the SessionHandle is changed between the times the connection is
    used. */
 struct POP3 {
-  curl_off_t *bytecountp;
   curl_pp_transfer transfer;
   char *id;               /* Message ID */
   char *custom;           /* Custom Request */