generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

transfer: Replace __func__ instances with function name

Browse Source 
.. 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__.
This commit is contained in:
Jay Satiro
2015-05-19 02:23:55 -04:00
parent 3d38a38012
commit dd23c49546
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/multi.c
View File

@@ -1509,7 +1509,8 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
break; 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 */ /* read/write data if it is ready to do so */
result = Curl_readwrite(data->easy_conn, &done); result = Curl_readwrite(data->easy_conn, &done);

4
lib/transfer.c
View File

@@ -1048,7 +1048,7 @@ CURLcode Curl_readwrite(struct connectdata *conn,
if(conn->data->state.drain) { if(conn->data->state.drain) {
select_res |= CURL_CSELECT_IN; 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 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; 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)); select_res));
/* We go ahead and do a read if we have a readable socket or if /* We go ahead and do a read if we have a readable socket or if