remove the data and conn fields from the Curl_transfer_keeper struct, they

weren't used anyway and mostly caused confusion

diff --git a/lib/transfer.c b/lib/transfer.c
index 0b0563f41cea92bb0afbdbf9144f7327c518a25a..20088b17dfcca7df429d7f2a89cf30e448089978 100644 (file)
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -960,7 +960,6 @@ CURLcode Curl_readwrite_init(struct connectdata *conn)
   k->now = k->start;   /* current time is now */
   k->header = TRUE; /* assume header */
   k->httpversion = -1; /* unknown at this point */
-  k->conn = (struct connectdata *)conn; /* store the connection */
 
   data = conn->data; /* there's the root struct */
   k->buf = data->state.buffer;

diff --git a/lib/urldata.h b/lib/urldata.h
index ce15dbf9f5f773c659c76c20a4dd07b79b0d576d..6acb8d8168d7860bfb7f01ecc32d3ba4996aa437 100644 (file)
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -248,9 +248,6 @@ struct Curl_transfer_keeper {
   long bodywrites;
   int writetype;
 
-  /* the highest fd we use + 1 */
-  struct SessionHandle *data;
-  struct connectdata *conn;
   char *buf;
   char *uploadbuf;
   int maxfd;