From dd23c49546c82e1e295e9e9ab284f528f4fd0851 Mon Sep 17 00:00:00 2001 From: Jay Satiro Date: Tue, 19 May 2015 02:23:55 -0400 Subject: 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__. --- lib/multi.c | 3 ++- lib/transfer.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/multi.c b/lib/multi.c index 2a7d8bede..a5790cb02 100644 --- 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 59e6acb4d..eac692b4d 100644 --- 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 -- cgit v1.2.3