From 7fef4016def79e35ef6194e9a44ef90075f84348 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Sun, 2 Mar 2014 09:50:36 +0000 Subject: [PATCH] tool: Do not output libcurl source for the information only parameters Ensure a source file isn't generated for the following informational command line parameters when --libcurl is specified: --help, --manual, --version and --engine list As the output would only include a fairly empty looking main() function and a call to curl_easy_init() and curl_easy_cleanup() when performed with --engine list. --- src/tool_operate.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/tool_operate.c b/src/tool_operate.c index 03907e7..689f769 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -1839,6 +1839,9 @@ CURLcode operate(struct GlobalConfig *config, int argc, argv_item_t argv[]) #ifndef CURL_DISABLE_LIBCURL_OPTION /* Cleanup the libcurl source output */ easysrc_cleanup(); + + /* Dump the libcurl code if previously enabled */ + dumpeasysrc(config); #endif } else @@ -1846,12 +1849,5 @@ CURLcode operate(struct GlobalConfig *config, int argc, argv_item_t argv[]) } } -#ifndef CURL_DISABLE_LIBCURL_OPTION - /* Dump the libcurl code if previously enabled. - NOTE: that this function relies on config->errors amongst other things - so not everything can be closed and cleaned before this is called */ - dumpeasysrc(config); -#endif - return result; } -- 2.7.4