romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 13:43:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

curl: unify pointer names to global config

Browse source 
Use 'config' for pointing to a OperationConfig

Use 'global' for pointing to GlobalConfig

Bonus: add config_alloc(), an easier way to allocate + init a new
OperationConfig struct.

Closes #17888
This commit is contained in:
Daniel Stenberg 2025-07-10 16:10:59 +02:00
parent 695eee432f
commit d516628d14
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
20 changed files with 110 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/tool_main.c
View file

@ -145,7 +145,7 @@ static void memory_tracking_init(void)
* _any_ libcurl usage. If this fails, *NO* libcurl functions may be
* used, or havoc may be the result.
*/
static CURLcode main_init(struct GlobalConfig *config)
static CURLcode main_init(struct GlobalConfig *global)
{
CURLcode result = CURLE_OK;
@ -155,68 +155,63 @@ static CURLcode main_init(struct GlobalConfig *config)
#endif
/* Initialise the global config */
config->showerror = FALSE; /* show errors when silent */
config->styled_output = TRUE; /* enable detection */
config->parallel_max = PARALLEL_DEFAULT;
global->showerror = FALSE; /* show errors when silent */
global->styled_output = TRUE; /* enable detection */
global->parallel_max = PARALLEL_DEFAULT;
/* Allocate the initial operate config */
config->first = config->last = malloc(sizeof(struct OperationConfig));
if(config->first) {
global->first = global->last = config_alloc(global);
if(global->first) {
/* Perform the libcurl initialization */
result = curl_global_init(CURL_GLOBAL_DEFAULT);
if(!result) {
/* Get information about libcurl */
result = get_libcurl_info();
if(!result) {
/* Initialise the config */
config_init(config->first);
config->first->global = config;
}
else {
errorf(config, "error retrieving curl library information");
free(config->first);
if(result) {
errorf(global, "error retrieving curl library information");
free(global->first);
}
}
else {
errorf(config, "error initializing curl library");
free(config->first);
errorf(global, "error initializing curl library");
free(global->first);
}
}
else {
errorf(config, "error initializing curl");
errorf(global, "error initializing curl");
result = CURLE_FAILED_INIT;
}
return result;
}
static void free_globalconfig(struct GlobalConfig *config)
static void free_globalconfig(struct GlobalConfig *global)
{
tool_safefree(config->trace_dump);
tool_safefree(global->trace_dump);
if(config->trace_fopened && config->trace_stream)
fclose(config->trace_stream);
config->trace_stream = NULL;
if(global->trace_fopened && global->trace_stream)
fclose(global->trace_stream);
global->trace_stream = NULL;
tool_safefree(config->libcurl);
tool_safefree(global->libcurl);
}
/*
* This is the main global destructor for the app. Call this after
* _all_ libcurl usage is done.
* This is the main global destructor for the app. Call this after _all_
* libcurl usage is done.
*/
static void main_free(struct GlobalConfig *config)
static void main_free(struct GlobalConfig *global)
{
/* Cleanup the easy handle */
/* Main cleanup */
curl_global_cleanup();
free_globalconfig(config);
free_globalconfig(global);
/* Free the config structures */
config_free(config->last);
config->first = NULL;
config->last = NULL;
/* Free the OperationConfig structures */
config_free(global->last);
global->first = NULL;
global->last = NULL;
}
/*