Cleanup config_initialize_internal

This commit is contained in:
twinaphex 2020-08-24 23:09:55 +02:00
parent 88f01c51a7
commit ceca44b233

View File

@ -374,7 +374,7 @@ static void add_sub_conf(config_file_t *conf, char *path, config_file_cb_t *cb)
if (!config_file_initialize_internal( if (!config_file_initialize_internal(
sub_conf, real_path, conf->include_depth + 1, cb)) sub_conf, real_path, conf->include_depth + 1, cb))
{ {
free(sub_conf); config_file_free(conf);
return; return;
} }
@ -529,9 +529,8 @@ static bool config_file_initialize_internal(
if (!list) if (!list)
{ {
config_file_free(conf);
filestream_close(file); filestream_close(file);
return NULL; return false;
} }
list->readonly = false; list->readonly = false;
@ -736,7 +735,7 @@ config_file_t *config_file_new_with_callback(
return conf; return conf;
if (!config_file_initialize_internal(conf, path, 0, cb)) if (!config_file_initialize_internal(conf, path, 0, cb))
{ {
free(conf); config_file_free(conf);
return NULL; return NULL;
} }
return conf; return conf;
@ -751,7 +750,7 @@ config_file_t *config_file_new(const char *path)
return conf; return conf;
if (!config_file_initialize_internal(conf, path, 0, NULL)) if (!config_file_initialize_internal(conf, path, 0, NULL))
{ {
free(conf); config_file_free(conf);
return NULL; return NULL;
} }
return conf; return conf;