luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tool_operate: avoid a few #ifdefs for disabled-libcurl builds

Browse Source 
By providing empty macros in the header file instead, the code gets
easier to read and yet is disabled on demand.

Closes #9486
This commit is contained in:
Daniel Stenberg 2022-09-12 16:30:54 +02:00
parent c3a6165307
commit ee56e6ff12
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/tool_easysrc.h
View File

@ -46,6 +46,13 @@ extern CURLcode easysrc_cleanup(void);
void dumpeasysrc(struct GlobalConfig *config);
#else /* CURL_DISABLE_LIBCURL_OPTION is defined */
#define easysrc_init() CURLE_OK
#define easysrc_cleanup()
#define dumpeasysrc(x)
#define easysrc_perform(x) CURLE_OK
#endif /* CURL_DISABLE_LIBCURL_OPTION */
#endif /* HEADER_CURL_TOOL_EASYSRC_H */

9
src/tool_operate.c
View File

@ -2417,13 +2417,12 @@ static CURLcode serial_transfers(struct GlobalConfig *global,
if(result)
break;
#ifndef CURL_DISABLE_LIBCURL_OPTION
if(global->libcurl) {
result = easysrc_perform();
if(result)
break;
}
#endif
start = tvnow();
#ifdef CURLDEBUG
if(global->test_event_based)
@ -2695,12 +2694,10 @@ CURLcode operate(struct GlobalConfig *global, int argc, argv_item_t argv[])
result = CURLE_FAILED_INIT;
}
else {
#ifndef CURL_DISABLE_LIBCURL_OPTION
if(global->libcurl) {
/* Initialise the libcurl source output */
result = easysrc_init();
}
#endif
/* Perform the main operations */
if(!result) {
@ -2708,12 +2705,10 @@ CURLcode operate(struct GlobalConfig *global, int argc, argv_item_t argv[])
struct OperationConfig *operation = global->first;
CURLSH *share = curl_share_init();
if(!share) {
#ifndef CURL_DISABLE_LIBCURL_OPTION
if(global->libcurl) {
/* Cleanup the libcurl source output */
easysrc_cleanup();
}
#endif
return CURLE_OUT_OF_MEMORY;
}
@ -2737,7 +2732,6 @@ CURLcode operate(struct GlobalConfig *global, int argc, argv_item_t argv[])
result = run_all_transfers(global, share, result);
curl_share_cleanup(share);
#ifndef CURL_DISABLE_LIBCURL_OPTION
if(global->libcurl) {
/* Cleanup the libcurl source output */
easysrc_cleanup();
@ -2745,7 +2739,6 @@ CURLcode operate(struct GlobalConfig *global, int argc, argv_item_t argv[])
/* Dump the libcurl code if previously enabled */
dumpeasysrc(global);
}
#endif
}
else
errorf(global, "out of memory\n");