[GNUnet-SVN] [gnurl] 131/205: connect: fix unreferenced parameter warning

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to annotated tag gnurl-7.54.0
in repository gnurl.

commit a8e523f086c12e7bb9acb18d1ac84d92dde0605b
Author: Marcel Raad <address@hidden>
AuthorDate: Thu Mar 30 10:14:34 2017 +0200

    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.
---
 lib/connect.c | 2 +-
 lib/connect.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/connect.c b/lib/connect.c
index 197eff242..63ec50fdc 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -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
   )
diff --git a/lib/connect.h b/lib/connect.h
index 5653cb4e5..44bdb1051 100644
--- a/lib/connect.h
+++ b/lib/connect.h
@@ -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)

-- 
To stop receiving notification emails like this one, please contact
address@hidden