transfer: Replace __func__ instances with function name

.. also make __func__ replacement in multi.

Prior to this change debug builds would fail to build if the compiler
was building pre-c99 and didn't support __func__.

diff --git a/lib/multi.c b/lib/multi.c
index 2a7d8bede709d0f8e974dd1c94b92557b8362ad5..a5790cb0290ec65570095a9fcb94739bc117bb43 100644 (file)
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -1509,7 +1509,8 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
         break;
       }
 
-      DEBUGF(infof(data, "%s:%d call Curl_readwrite\n", __func__, __LINE__));
+      DEBUGF(infof(data, "multi_runsingle:%d call Curl_readwrite\n",
+                   __LINE__));
 
       /* read/write data if it is ready to do so */
       result = Curl_readwrite(data->easy_conn, &done);

diff --git a/lib/transfer.c b/lib/transfer.c
index 59e6acb4d6084de0c1f41a0de5c9af7713398b50..eac692b4d81cca6c1f6bacb00b491084d27f999e 100644 (file)
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -1048,7 +1048,7 @@ CURLcode Curl_readwrite(struct connectdata *conn,
 
   if(conn->data->state.drain) {
     select_res |= CURL_CSELECT_IN;
-    DEBUGF(infof(data, "%s: forcibly told to drain data\n", __func__));
+    DEBUGF(infof(data, "Curl_readwrite: forcibly told to drain data\n"));
   }
 
   if(!select_res) /* Call for select()/poll() only, if read/write/error
@@ -1060,7 +1060,7 @@ CURLcode Curl_readwrite(struct connectdata *conn,
     return CURLE_SEND_ERROR;
   }
 
-  DEBUGF(infof(data, "%s: keepon: %x select_res %x\n", __func__, k->keepon,
+  DEBUGF(infof(data, "Curl_readwrite: keepon: %x select_res %x\n", k->keepon,
                select_res));
 
   /* We go ahead and do a read if we have a readable socket or if