Compilation fix

diff --git a/lib/ftp.c b/lib/ftp.c
index 4ab242f636284d81e0f7237eada4657d55e05da6..aefd6de0b5261ba2fbacb9ee50b389b4d1eaa66f 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -1162,7 +1162,7 @@ static CURLcode ftp_state_use_port(struct connectdata *conn,
   if(freeaddr)
     Curl_freeaddrinfo(addr);
 
-  ftp->count1 = PORT;
+  ftpc->count1 = PORT;
 
 #endif /* end of ipv4-specific code */
 

diff --git a/lib/hostip.h b/lib/hostip.h
index dd8ec3a5efa1ed7a4e8455361678a549178e3dae..e6d63ca7105d74c510e5506d906f25e7e5e3bbdd 100644 (file)
--- a/lib/hostip.h
+++ b/lib/hostip.h
@@ -88,7 +88,7 @@
 #else
 #define CURL_ASYNC_SUCCESS CURLE_OK
 #define ares_cancel(x) do {} while(0)
-#define ares_destroy(x) do {} while (0);
+#define ares_destroy(x) do {} while(0)
 #endif
 
 /*

diff --git a/lib/ldap.c b/lib/ldap.c
index 1df76f4d321cac934472386c53c95df5aad79f26..cad5f7fe65950d064c4088dd0b60028601245fc6 100644 (file)
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -551,7 +551,10 @@ static int _ldap_url_parse2 (const struct connectdata *conn, LDAPURLDesc *ludp)
   char *p, *q;
   int i;
 
-  if (!conn->path || conn->path[0] != '/' ||
+  if (!conn->data || 
+      !conn->data->reqdata ||
+      !conn->data->reqdata->path || 
+       conn->data->reqdata->path[0] != '/' ||
       !checkprefix(conn->protostr, conn->data->change.url))
      return LDAP_INVALID_SYNTAX;
 

diff --git a/lib/multi.c b/lib/multi.c
index e6b188135f24438a449e8f7db1befaabbeb2f397..24931a1b65c73a8603331936034abf6c416d8878 100644 (file)
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -193,11 +193,11 @@ static void multistate(struct Curl_one_easy *easy, CURLMstate state)
 
   easy->state = state;
 
+#ifdef CURLDEBUG
   if(easy->state > CURLM_STATE_CONNECT &&
      easy->state < CURLM_STATE_COMPLETED)
     index = easy->easy_conn->connectindex;
 
-#ifdef CURLDEBUG
   infof(easy->easy_handle,
         "STATE: %s => %s handle %p; (connection #%d) \n",
         statename[oldstate], statename[easy->state],