summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJiri Hruska <jirka@fud.cz>2013-02-25 18:40:32 +0100
committerSteve Holme <steve_holme@hotmail.com>2013-02-25 22:05:20 +0000
commit005ad9e60d6e08d072afa026ec42faca5a3f3859 (patch)
tree2973455cfa732caedba9f857757e5480c2133419 /lib
parenta360944ed6eea4fee1131dcb9cad7298ec6fc7a6 (diff)
downloadcurl-005ad9e60d6e08d072afa026ec42faca5a3f3859.tar.gz
imap: Removed bytecountp from the per-request structure
Removed this pointer to a downloaded bytes counter because it was set in imap_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.
Diffstat (limited to 'lib')
-rw-r--r--lib/imap.c6
-rw-r--r--lib/imap.h1
2 files changed, 1 insertions, 6 deletions
diff --git a/lib/imap.c b/lib/imap.c
index 847acd74a..d219b7454 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -1185,7 +1185,6 @@ static CURLcode imap_state_fetch_resp(struct connectdata *conn, int imapcode,
CURLcode result = CURLE_OK;
struct SessionHandle *data = conn->data;
struct imap_conn *imapc = &conn->proto.imapc;
- struct IMAP *imap = data->state.proto.imap;
struct pingpong *pp = &imapc->pp;
const char *ptr = data->state.buffer;
@@ -1246,7 +1245,7 @@ static CURLcode imap_state_fetch_resp(struct connectdata *conn, int imapcode,
Curl_setup_transfer(conn, -1, -1, FALSE, NULL, -1, NULL);
else
/* IMAP download */
- Curl_setup_transfer(conn, FIRSTSOCKET, size, FALSE, imap->bytecountp,
+ Curl_setup_transfer(conn, FIRSTSOCKET, size, FALSE, NULL,
-1, NULL); /* no upload here */
data->req.maxdownload = size;
@@ -1411,9 +1410,6 @@ static CURLcode imap_init(struct connectdata *conn)
return CURLE_OUT_OF_MEMORY;
}
- /* Get some initial data into the imap struct */
- imap->bytecountp = &data->req.bytecount;
-
return CURLE_OK;
}
diff --git a/lib/imap.h b/lib/imap.h
index 09c296f4c..08c35b630 100644
--- a/lib/imap.h
+++ b/lib/imap.h
@@ -56,7 +56,6 @@ typedef enum {
perhaps the SessionHandle is changed between the times the connection is
used. */
struct IMAP {
- curl_off_t *bytecountp;
curl_pp_transfer transfer;
char *mailbox; /* Mailbox to select */
char *uidvalidity; /* UIDVALIDITY to check in select */