generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

imap: Removed bytecountp from the per-request structure

Browse Source 
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.
This commit is contained in:
Jiri Hruska 2013-02-25 18:40:32 +01:00 committed by Steve Holme
parent a360944ed6
commit 005ad9e60d
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/imap.c
View File

@ -1185,7 +1185,6 @@ static CURLcode imap_state_fetch_resp(struct connectdata *conn, int imapcode,
CURLcode result = CURLE_OK; CURLcode result = CURLE_OK;
struct SessionHandle *data = conn->data; struct SessionHandle *data = conn->data;
struct imap_conn *imapc = &conn->proto.imapc; struct imap_conn *imapc = &conn->proto.imapc;
struct IMAP *imap = data->state.proto.imap;
struct pingpong *pp = &imapc->pp; struct pingpong *pp = &imapc->pp;
const char *ptr = data->state.buffer; 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); Curl_setup_transfer(conn, -1, -1, FALSE, NULL, -1, NULL);
else else
/* IMAP download */ /* IMAP download */
Curl_setup_transfer(conn, FIRSTSOCKET, size, FALSE, imap->bytecountp, Curl_setup_transfer(conn, FIRSTSOCKET, size, FALSE, NULL,
-1, NULL); /* no upload here */ -1, NULL); /* no upload here */
data->req.maxdownload = size; data->req.maxdownload = size;
@ -1411,9 +1410,6 @@ static CURLcode imap_init(struct connectdata *conn)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
} }
/* Get some initial data into the imap struct */
imap->bytecountp = &data->req.bytecount;
return CURLE_OK; return CURLE_OK;
} }

1
lib/imap.h
View File

@ -56,7 +56,6 @@ typedef enum {
perhaps the SessionHandle is changed between the times the connection is perhaps the SessionHandle is changed between the times the connection is
used. */ used. */
struct IMAP { struct IMAP {
curl_off_t *bytecountp;
curl_pp_transfer transfer; curl_pp_transfer transfer;
char *mailbox; /* Mailbox to select */ char *mailbox; /* Mailbox to select */
char *uidvalidity; /* UIDVALIDITY to check in select */ char *uidvalidity; /* UIDVALIDITY to check in select */