aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/ftp.c2
-rw-r--r--lib/hostip.h2
-rw-r--r--lib/ldap.c5
-rw-r--r--lib/multi.c2
4 files changed, 7 insertions, 4 deletions
diff --git a/lib/ftp.c b/lib/ftp.c
index 4ab242f63..aefd6de0b 100644
--- 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 dd8ec3a5e..e6d63ca71 100644
--- 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 1df76f4d3..cad5f7fe6 100644
--- 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 e6b188135..24931a1b6 100644
--- 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],