From 005ad9e60d6e08d072afa026ec42faca5a3f3859 Mon Sep 17 00:00:00 2001 From: Jiri Hruska Date: Mon, 25 Feb 2013 18:40:32 +0100 Subject: 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. --- lib/imap.c | 6 +----- lib/imap.h | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'lib') 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 */ -- cgit v1.2.3