reqdata doesn't exist anymore and the path moved to the UrlState struct

diff --git a/lib/ldap.c b/lib/ldap.c
index d3cee51890b7a7c621289cb1bf1c0c47f1e5ae0c..4f5625c404327832b0df68aa1db17c338ae2e895 100644 (file)
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -555,7 +555,7 @@ static bool unescape_elements (void *data, LDAPURLDesc *ludp)
  *
  * <hostname> already known from 'conn->host.name'.
  * <port>     already known from 'conn->remote_port'.
- * extract the rest from 'conn->data->reqdata.path+1'. All fields are optional.
+ * extract the rest from 'conn->data->state.path+1'. All fields are optional.
  * e.g.
  *   ldap://<hostname>:<port>/?<attributes>?<scope>?<filter>
  * yields ludp->lud_dn = "".
@@ -568,8 +568,8 @@ static int _ldap_url_parse2 (const struct connectdata *conn, LDAPURLDesc *ludp)
   int i;
 
   if(!conn->data ||
-      !conn->data->reqdata.path ||
-      conn->data->reqdata.path[0] != '/' ||
+      !conn->data->state.path ||
+      conn->data->state.path[0] != '/' ||
       !checkprefix(conn->protostr, conn->data->change.url))
     return LDAP_INVALID_SYNTAX;
 
@@ -579,7 +579,7 @@ static int _ldap_url_parse2 (const struct connectdata *conn, LDAPURLDesc *ludp)
 
   /* parse DN (Distinguished Name).
    */
-  ludp->lud_dn = strdup(conn->data->reqdata.path+1);
+  ludp->lud_dn = strdup(conn->data->state.path+1);
   if(!ludp->lud_dn)
     return LDAP_NO_MEMORY;
 

diff --git a/lib/tftp.c b/lib/tftp.c
index 245334ae79b1debe239aeaf3cff92a3f42d77b5b..dd64bef9fd4d05db25880749dd6935d4735e643c 100644 (file)
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -676,10 +676,6 @@ static CURLcode Curl_tftp_done(struct connectdata *conn, CURLcode status,
   (void)status; /* unused */
   (void)premature; /* not used */
 
-#if 0
-  free(conn->data->reqdata.proto.tftp);
-  conn->data->reqdata.proto.tftp = NULL;
-#endif
   Curl_pgrsDone(conn);
 
   return CURLE_OK;

diff --git a/lib/url.c b/lib/url.c
index bd792332077ecdece273ed1fa521d1a1e892edf1..e7c1412bfbe7063b4765d4a426f944a75370a89b 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -2249,7 +2249,7 @@ static void Curl_printPipeline(struct curl_llist *pipeline)
   curr = pipeline->head;
   while(curr) {
     struct SessionHandle *data = (struct SessionHandle *) curr->ptr;
-    infof(data, "Handle in pipeline: %s\n", data->reqdata.path);
+    infof(data, "Handle in pipeline: %s\n", data->state.path);
     curr = curr->next;
   }
 }