summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Raad <raad@teamviewer.com>2017-03-30 10:14:34 +0200
committerMarcel Raad <raad@teamviewer.com>2017-03-30 10:14:34 +0200
commita8e523f086c12e7bb9acb18d1ac84d92dde0605b (patch)
tree96adedb1c610880d8643e62c59443df77b0b957a
parent1b4b2c1a59aaaf9dfc28290e9c54c410aa2d858a (diff)
downloadcurl-a8e523f086c12e7bb9acb18d1ac84d92dde0605b.tar.gz
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.
-rw-r--r--lib/connect.c2
-rw-r--r--lib/connect.h6
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)