Unverified Commit a8e523f0 authored by Marcel Raad's avatar Marcel Raad
Browse files

connect: fix unreferenced parameter warning 

When CURL_DISABLE_VERBOSE_STRINGS is defined, the reason parameter in
Curl_conncontrol is not used as the infof macro expands to nothing.
parent 1b4b2c1a

lib/connect.c

+1 −1
Original line number Diff line number Diff line
@@ -1385,7 +1385,7 @@ CURLcode Curl_socket(struct connectdata *conn, 
 */

void Curl_conncontrol(struct connectdata *conn,

                      int ctrl /* see defines in header */

#ifdef DEBUGBUILD

#if defined(DEBUGBUILD) && !defined(CURL_DISABLE_VERBOSE_STRINGS)

                      , const char *reason

#endif

  )

lib/connect.h

+3 −3
Original line number Diff line number Diff line
@@ -127,16 +127,16 @@ void Curl_tcpnodelay(struct connectdata *conn, curl_socket_t sockfd); 


void Curl_conncontrol(struct connectdata *conn,

                      int closeit

#ifdef DEBUGBUILD

#if defined(DEBUGBUILD) && !defined(CURL_DISABLE_VERBOSE_STRINGS)

                      , const char *reason

#endif

  );



#ifdef DEBUGBUILD

#if defined(DEBUGBUILD) && !defined(CURL_DISABLE_VERBOSE_STRINGS)

#define streamclose(x,y) Curl_conncontrol(x, CONNCTRL_STREAM, y)

#define connclose(x,y) Curl_conncontrol(x, CONNCTRL_CONNECTION, y)

#define connkeep(x,y) Curl_conncontrol(x, CONNCTRL_KEEP, y)

#else /* if !CURLDEBUG */

#else /* if !DEBUGBUILD || CURL_DISABLE_VERBOSE_STRINGS */

#define streamclose(x,y) Curl_conncontrol(x, CONNCTRL_STREAM)

#define connclose(x,y) Curl_conncontrol(x, CONNCTRL_CONNECTION)

#define connkeep(x,y) Curl_conncontrol(x, CONNCTRL_KEEP)