From 8914857092f1c7ceb3342b9c4f5e03587e634f5d Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 7 May 2010 23:24:47 +0200 Subject: verboseconnect: so the verbose checking within the function As the function is used more than once and libcurl can be built without it, do the conditional check within the verboseconnect() function itself. --- lib/url.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/url.c b/lib/url.c index 0f5ac2d14..9c9e09fbc 100644 --- a/lib/url.c +++ b/lib/url.c @@ -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; -- cgit v1.2.3