curl_log: for failf/infof and debug logging implementations

 - new functions and macros for cfilter debugging
 - set CURL_DEBUG with names of cfilters where debug logging should be
   enabled
 - use GNUC __attribute__ to enable printf format checks during compile

Closes #10271

1 files changed, 3 insertions, 30 deletions

diff --git a/lib/cfilters.c b/lib/cfilters.c
index 7f524cdb8..9582a951a 100644
--- a/lib/cfilters.c
+++ b/lib/cfilters.c
@@ -44,13 +44,6 @@
 #define ARRAYSIZE(A) (sizeof(A)/sizeof((A)[0]))
 #endif
 
-#define DEBUG_CF 0
-
-#if DEBUG_CF
-#define CF_DEBUGF(x) x
-#else
-#define CF_DEBUGF(x) do { } while(0)
-#endif
 
 void Curl_cf_def_destroy_this(struct Curl_cfilter *cf, struct Curl_easy *data)
 {
@@ -197,7 +190,6 @@ ssize_t Curl_conn_recv(struct Curl_easy *data, int num, char *buf,
                        size_t len, CURLcode *code)
 {
   struct Curl_cfilter *cf;
-  ssize_t nread;
 
   DEBUGASSERT(data);
   DEBUGASSERT(data->conn);
@@ -206,10 +198,7 @@ ssize_t Curl_conn_recv(struct Curl_easy *data, int num, char *buf,
     cf = cf->next;
   }
   if(cf) {
-    nread = cf->cft->do_recv(cf, data, buf, len, code);
-    CF_DEBUGF(infof(data, "Curl_conn_recv(handle=%p, index=%d)"
-              "-> %ld, err=%d", data, num, nread, *code));
-    return nread;
+    return cf->cft->do_recv(cf, data, buf, len, code);
   }
   failf(data, CMSGI(data->conn, num, "recv: no filter connected"));
   *code = CURLE_FAILED_INIT;
@@ -220,7 +209,6 @@ ssize_t Curl_conn_send(struct Curl_easy *data, int num,
                        const void *mem, size_t len, CURLcode *code)
 {
   struct Curl_cfilter *cf;
-  ssize_t nwritten;
 
   DEBUGASSERT(data);
   DEBUGASSERT(data->conn);
@@ -229,10 +217,7 @@ ssize_t Curl_conn_send(struct Curl_easy *data, int num,
     cf = cf->next;
   }
   if(cf) {
-    nwritten = cf->cft->do_send(cf, data, mem, len, code);
-    CF_DEBUGF(infof(data, "Curl_conn_send(handle=%p, index=%d, len=%ld)"
-              " -> %ld, err=%d", data, num, len, nwritten, *code));
-    return nwritten;
+    return cf->cft->do_send(cf, data, mem, len, code);
   }
   failf(data, CMSGI(data->conn, num, "send: no filter connected"));
   DEBUGASSERT(0);
@@ -274,7 +259,7 @@ void Curl_conn_cf_add(struct Curl_easy *data,
   cf->conn = conn;
   cf->sockindex = index;
   conn->cfilter[index] = cf;
-  CF_DEBUGF(infof(data, CFMSG(cf, "added")));
+  DEBUGF(LOG_CF(data, cf, "added"));
 }
 
 void Curl_conn_cf_insert_after(struct Curl_cfilter *cf_at,
@@ -381,18 +366,6 @@ CURLcode Curl_conn_connect(struct Curl_easy *data,
     }
   }
 
-#ifdef DEBUGBUILD
-  if(result) {
-    CF_DEBUGF(infof(data, DMSGI(data, sockindex, "connect()-> %d, done=%d"),
-           result, *done));
-  }
-  else if(!*done) {
-    while(cf->next && !cf->next->connected)
-      cf = cf->next;
-    CF_DEBUGF(infof(data, DMSGI(data, sockindex, "connect()-> waiting for %s"),
-           cf->cft->name));
-  }
-#endif
   return result;
 }