Commit dd23c495 authored by Jay Satiro's avatar Jay Satiro
Browse files

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__.
parent 3d38a380

lib/multi.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

lib/transfer.c

+2 −2
Original line number Diff line number Diff line
@@ -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