avoid the use of variadic macros for greater portability
This commit is contained in:
parent
842be6c52f
commit
fe10cb2ef5
@ -224,6 +224,10 @@ 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;
|
||||
@ -234,6 +238,7 @@ 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.
|
||||
|
14
lib/sendf.h
14
lib/sendf.h
@ -7,7 +7,7 @@
|
||||
* | (__| |_| | _ <| |___
|
||||
* \___|\___/|_| \_\_____|
|
||||
*
|
||||
* Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||
* Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||
*
|
||||
* This software is licensed as described in the file COPYING, which
|
||||
* you should have received as part of this distribution. The terms
|
||||
@ -28,19 +28,7 @@ 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
|
||||
|
Loading…
Reference in New Issue
Block a user