From 62bcf005f4678a93158358265ba905bace33b834 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Tue, 11 Oct 2011 03:24:40 +0200 Subject: [PATCH] typecheck: allow NULL to unset CURLOPT_ERRORBUFFER There might be situations where a user would want to unset this option. Avoid forcing him/her to cast the NULL argument to (char *) in order to get past the compile time typecheck. --- include/curl/typecheck-gcc.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/curl/typecheck-gcc.h b/include/curl/typecheck-gcc.h index 4e00ca9a4..5c584b002 100644 --- a/include/curl/typecheck-gcc.h +++ b/include/curl/typecheck-gcc.h @@ -392,7 +392,8 @@ _CURL_WARNING(_curl_easy_getinfo_err_curl_slist, /* evaluates to true if expr is abuffer suitable for CURLOPT_ERRORBUFFER */ /* XXX: also check size of an char[] array? */ #define _curl_is_error_buffer(expr) \ - (__builtin_types_compatible_p(__typeof__(expr), char *) || \ + (_curl_is_NULL(expr) || \ + __builtin_types_compatible_p(__typeof__(expr), char *) || \ __builtin_types_compatible_p(__typeof__(expr), char[])) /* evaluates to true if expr is of type (const) void* or (const) FILE* */