curl-library
[PATCH 1/7] Comment and debug output fixes.
From: Carlo Wood <carlo_at_alinoe.com>
Date: Thu, 6 Nov 2014 03:03:15 +0100
Date: Thu, 6 Nov 2014 03:03:15 +0100
Debug output 'typo' fix.
Don't print an extra "0x" in
* Pipe broke: handle 0x0x2546d88, url = /
Add debug output.
Print the number of connections in the connection cache when
adding one, and not only when one is removed.
Fix typos in comments.
---
lib/conncache.c | 4 ++++
lib/connect.c | 2 +-
lib/multi.c | 4 ++--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/lib/conncache.c b/lib/conncache.c
index 9522aeb..d07718e 100644
--- a/lib/conncache.c
+++ b/lib/conncache.c
@@ -152,6 +152,10 @@ CURLcode Curl_conncache_add_conn(struct conncache *connc,
conn->connection_id = connc->next_connection_id++;
connc->num_connections++;
+ DEBUGF(infof(conn->data, "Added connection %d. "
+ "The cache now contains %d members\n",
+ conn->connection_id, connc->num_connections));
+
return CURLE_OK;
}
diff --git a/lib/connect.c b/lib/connect.c
index 5d522b3..f7dab87 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -1326,7 +1326,7 @@ CURLcode Curl_socket(struct connectdata *conn,
#ifdef CURLDEBUG
/*
* Curl_conncontrol() is used to set the conn->bits.close bit on or off. It
- * MUST be called with the connclose() or connclose() macros with a stated
+ * MUST be called with the connclose() or connkeep() macros with a stated
* reason. The reason is only shown in debug builds but helps to figure out
* decision paths when connections are or aren't re-used as expected.
*/
diff --git a/lib/multi.c b/lib/multi.c
index 98d117d..6ee17c6 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -525,7 +525,7 @@ CURLMcode curl_multi_remove_handle(CURLM *multi_handle,
connection. */
connclose(data->easy_conn, "Removed with partial response");
/* Set connection owner so that Curl_done() closes it.
- We can sefely do this here since connection is killed. */
+ We can safely do this here since connection is killed. */
data->easy_conn->data = easy;
}
@@ -944,7 +944,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
/* Handle the case when the pipe breaks, i.e., the connection
we're using gets cleaned up and we're left with nothing. */
if(data->state.pipe_broke) {
- infof(data, "Pipe broke: handle 0x%p, url = %s\n",
+ infof(data, "Pipe broke: handle %p, url = %s\n",
(void *)data, data->state.path);
if(data->mstate < CURLM_STATE_COMPLETED) {
--
2.1.1
-------------------------------------------------------------------
List admin: http://cool.haxx.se/list/listinfo/curl-library
Etiquette: http://curl.haxx.se/mail/etiquette.html
Received on 2014-11-06