aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/sendf.c5
-rw-r--r--lib/sendf.h12
2 files changed, 12 insertions, 5 deletions
diff --git a/lib/sendf.c b/lib/sendf.c
index a4a1347f7..bf9ee490a 100644
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -224,10 +224,6 @@ static size_t convert_lineends(struct SessionHandle *data,
void Curl_infof(struct SessionHandle *data, const char *fmt, ...)
{
-#ifdef CURL_DISABLE_VERBOSE_STRINGS
- (void)data;
- (void)fmt;
-#else
if(data && data->set.verbose) {
va_list ap;
size_t len;
@@ -238,7 +234,6 @@ void Curl_infof(struct SessionHandle *data, const char *fmt, ...)
len = strlen(print_buffer);
Curl_debug(data, CURLINFO_TEXT, print_buffer, len, NULL);
}
-#endif
}
/* Curl_failf() is for messages stating why we failed.
diff --git a/lib/sendf.h b/lib/sendf.h
index 65926192d..514cc9182 100644
--- a/lib/sendf.h
+++ b/lib/sendf.h
@@ -28,7 +28,19 @@ CURLcode Curl_sendf(curl_socket_t sockfd, struct connectdata *,
void Curl_infof(struct SessionHandle *, const char *fmt, ...);
void Curl_failf(struct SessionHandle *, const char *fmt, ...);
+#if defined(CURL_DISABLE_VERBOSE_STRINGS)
+#if defined(__GNUC__)
+/* This style of variable argument macros is a gcc extension */
+#define infof(x...) /*ignore*/
+#else
+/* C99 compilers could use this if we could detect them */
+/*#define infof(...) */
+/* Cast the args to void to make them a noop, side effects notwithstanding */
+#define infof (void)
+#endif
+#else
#define infof Curl_infof
+#endif
#define failf Curl_failf
#define CLIENTWRITE_BODY 1