From f1a9e6858e6f2cd7ff54eac79df02640f0624a2a Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Sat, 1 Mar 2014 13:38:00 +0000 Subject: tool: Moved --libcurl to the global config --- src/tool_setopt.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/tool_setopt.h') diff --git a/src/tool_setopt.h b/src/tool_setopt.h index 8a17d9920..cd144bc0d 100644 --- a/src/tool_setopt.h +++ b/src/tool_setopt.h @@ -71,48 +71,48 @@ extern const NameValueUnsigned setopt_nv_CURLAUTH[]; /* Intercept setopt calls for --libcurl */ -CURLcode tool_setopt_enum(CURL *curl, struct OperationConfig *config, +CURLcode tool_setopt_enum(CURL *curl, struct GlobalConfig *config, const char *name, CURLoption tag, const NameValue *nv, long lval); -CURLcode tool_setopt_flags(CURL *curl, struct OperationConfig *config, +CURLcode tool_setopt_flags(CURL *curl, struct GlobalConfig *config, const char *name, CURLoption tag, const NameValue *nv, long lval); -CURLcode tool_setopt_bitmask(CURL *curl, struct OperationConfig *config, +CURLcode tool_setopt_bitmask(CURL *curl, struct GlobalConfig *config, const char *name, CURLoption tag, const NameValueUnsigned *nv, long lval); -CURLcode tool_setopt_httppost(CURL *curl, struct OperationConfig *config, +CURLcode tool_setopt_httppost(CURL *curl, struct GlobalConfig *config, const char *name, CURLoption tag, struct curl_httppost *httppost); -CURLcode tool_setopt_slist(CURL *curl, struct OperationConfig *config, +CURLcode tool_setopt_slist(CURL *curl, struct GlobalConfig *config, const char *name, CURLoption tag, struct curl_slist *list); -CURLcode tool_setopt(CURL *curl, bool str, struct OperationConfig *config, +CURLcode tool_setopt(CURL *curl, bool str, struct GlobalConfig *config, const char *name, CURLoption tag, ...); #define my_setopt(x,y,z) \ - SETOPT_CHECK(tool_setopt(x, FALSE, config, #y, y, z)) + SETOPT_CHECK(tool_setopt(x, FALSE, global, #y, y, z)) #define my_setopt_str(x,y,z) \ - SETOPT_CHECK(tool_setopt(x, TRUE, config, #y, y, z)) + SETOPT_CHECK(tool_setopt(x, TRUE, global, #y, y, z)) #define my_setopt_enum(x,y,z) \ - SETOPT_CHECK(tool_setopt_enum(x, config, #y, y, setopt_nv_ ## y, z)) + SETOPT_CHECK(tool_setopt_enum(x, global, #y, y, setopt_nv_ ## y, z)) #define my_setopt_flags(x,y,z) \ - SETOPT_CHECK(tool_setopt_flags(x, config, #y, y, setopt_nv_ ## y, z)) + SETOPT_CHECK(tool_setopt_flags(x, global, #y, y, setopt_nv_ ## y, z)) #define my_setopt_bitmask(x,y,z) \ - SETOPT_CHECK(tool_setopt_bitmask(x, config, #y, y, setopt_nv_ ## y, z)) + SETOPT_CHECK(tool_setopt_bitmask(x, global, #y, y, setopt_nv_ ## y, z)) #define my_setopt_httppost(x,y,z) \ - SETOPT_CHECK(tool_setopt_httppost(x, config, #y, y, z)) + SETOPT_CHECK(tool_setopt_httppost(x, global, #y, y, z)) #define my_setopt_slist(x,y,z) \ - SETOPT_CHECK(tool_setopt_slist(x, config, #y, y, z)) + SETOPT_CHECK(tool_setopt_slist(x, global, #y, y, z)) -#define res_setopt(x,y,z) tool_setopt(x, FALSE, config, #y, y, z) +#define res_setopt(x,y,z) tool_setopt(x, FALSE, global, #y, y, z) -#define res_setopt_str(x,y,z) tool_setopt(x, TRUE, config, #y, y, z) +#define res_setopt_str(x,y,z) tool_setopt(x, TRUE, global, #y, y, z) #else /* CURL_DISABLE_LIBCURL_OPTION */ -- cgit v1.2.3