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

verboseconnect: so the verbose checking within the function

Browse Source 
As the function is used more than once and libcurl can be built
without it, do the conditional check within the verboseconnect()
function itself.
This commit is contained in:
Daniel Stenberg 2010-05-07 23:24:47 +02:00
parent aca0fff4e1
commit 8914857092
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/url.c
View File

@ -154,7 +154,6 @@ static void signalPipeClose(struct curl_llist *pipeline, bool pipe_broke);
#define verboseconnect(x) do { } while (0)
#endif
/*
* Protocol table.
*/
@ -3181,9 +3180,10 @@ static CURLcode ConnectPlease(struct SessionHandle *data,
#ifndef CURL_DISABLE_VERBOSE_STRINGS
static void verboseconnect(struct connectdata *conn)
{
infof(conn->data, "Connected to %s (%s) port %ld (#%ld)\n",
conn->bits.proxy ? conn->proxy.dispname : conn->host.dispname,
conn->ip_addr_str, conn->port, conn->connectindex);
if(conn->data->set.verbose)
infof(conn->data, "Connected to %s (%s) port %ld (#%ld)\n",
conn->bits.proxy ? conn->proxy.dispname : conn->host.dispname,
conn->ip_addr_str, conn->port, conn->connectindex);
}
#endif
@ -3275,8 +3275,7 @@ CURLcode Curl_protocol_connect(struct connectdata *conn,
Curl_pgrsTime(data, TIMER_CONNECT); /* connect done */
if(data->set.verbose)
verboseconnect(conn);
verboseconnect(conn);
}
if(!conn->bits.protoconnstart) {
@ -4998,8 +4997,7 @@ static CURLcode setup_conn(struct connectdata *conn,
Curl_pgrsTime(data, TIMER_APPCONNECT); /* we're connected already */
conn->bits.tcpconnect = TRUE;
*protocol_done = TRUE;
if(data->set.verbose)
verboseconnect(conn);
verboseconnect(conn);
}
/* Stop the loop now */
break;