From: Carlo Wood <carlo@alinoe.com>
Date: Mon, 10 Nov 2014 16:55:41 +0100
Subject: [PATCH 1/7] cleanup: Comment and debug output fixes

Fixed some comment typos and debug output as follows:

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.

diff --git a/lib/conncache.c b/lib/conncache.c
index 9522aeb..f63a8f5 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 %ld. The cache now contains %"
+               CURL_FORMAT_CURL_OFF_TU " members\n",
+               conn->connection_id, (curl_off_t) connc->num_connections));
+
   return CURLE_OK;
 }
 
@@ -171,8 +175,9 @@ void Curl_conncache_remove_conn(struct conncache *connc,
     if(connc) {
       connc->num_connections--;
 
-      DEBUGF(infof(conn->data, "The cache now contains %d members\n",
-                   connc->num_connections));
+      DEBUGF(infof(conn->data, "The cache now contains %"
+                   CURL_FORMAT_CURL_OFF_TU " members\n",
+                   (curl_off_t) connc->num_connections));
     }
   }
 }
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) {