From fb3845a438cad9ef09eb1b0b86388ce99a726502 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Thu, 22 Sep 2011 11:16:34 +0200 Subject: curl tool: reviewed code moved to tool_*.[ch] files my_setopt and my_setopt_str no longer ignores curl_easy_setopt result. Fixed some OOM handling issues. --- src/tool_setopt.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/tool_setopt.h') diff --git a/src/tool_setopt.h b/src/tool_setopt.h index e75f328f3..d01c9eb24 100644 --- a/src/tool_setopt.h +++ b/src/tool_setopt.h @@ -29,22 +29,18 @@ CURLcode tool_setopt(CURL *curl, bool str, struct Configurable *config, /* * Macros used in operate() */ -#if 0 + #define my_setopt(x,y,z) do { \ res = tool_setopt(x, FALSE, config, #y, y, z); \ if(res) \ - goto quit_curl; \ + goto show_error; \ } WHILE_FALSE #define my_setopt_str(x,y,z) do { \ res = tool_setopt(x, TRUE, config, #y, y, z); \ if(res) \ - goto quit_curl; \ + goto show_error; \ } WHILE_FALSE -#else -#define my_setopt(x,y,z) tool_setopt(x, FALSE, config, #y, y, z) -#define my_setopt_str(x,y,z) tool_setopt(x, TRUE, config, #y, y, z) -#endif #define res_setopt(x,y,z) tool_setopt(x, FALSE, config, #y, y, z) -- cgit v1.2.3