romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-06-05 14:54:14 +03:00
Code Issues Projects Releases Packages Wiki Activity

tool_operate: Move the trace and error file closure to tool_cfgable

Browse source
This commit is contained in:
Steve Holme 2014-02-09 17:16:15 +00:00
parent ae363075e6
commit 86a40f5d1a
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/tool_cfgable.c
View file

@ -121,11 +121,15 @@ static void free_config_fields(struct Configurable *config)
Curl_safefree(config->xoauth2_bearer);
config->trace_stream = NULL; /* closed elsewhere when appropriate */
if(config->trace_fopened && config->trace_stream)
fclose(config->trace_stream);
config->trace_stream = NULL;
Curl_safefree(config->writeout);
config->errors = NULL; /* closed elsewhere when appropriate */
if(config->errors_fopened && config->errors)
fclose(config->errors);
config->errors = NULL;
curl_slist_free_all(config->quote);
curl_slist_free_all(config->postquote);

6
src/tool_operate.c
View file

@ -1786,9 +1786,6 @@ static int operate_do(struct Configurable *config)
if(heads.alloc_filename)
Curl_safefree(heads.filename);
if(config->trace_fopened && config->trace_stream)
fclose(config->trace_stream);
#ifndef CURL_DISABLE_LIBCURL_OPTION
/* Dump the libcurl code if previously enabled.
NOTE: that this function relies on config->errors amongst other things
@ -1801,9 +1798,6 @@ static int operate_do(struct Configurable *config)
static void operate_free(struct Configurable *config)
{
if(config->errors_fopened && config->errors)
fclose(config->errors);
/* Release metalink related resources here */
clean_metalink(config);
}