mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-04 07:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

config_file.c - use malloc instead of calloc

Browse Source
This commit is contained in:
twinaphex 2017-09-29 03:55:55 +02:00
parent 5b96231f49
commit 0f1d0ebfa9
1 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
libretro-common/file/config_file.c
View File

@ -52,10 +52,10 @@ struct config_entry_list
/* If we got this from an #include,
* do not allow overwrite. */
bool readonly;
char *key;
char *value;
uint32_t key_hash;
char *key;
char *value;
struct config_entry_list *next;
};
@ -240,7 +240,10 @@ static void add_sub_conf(config_file_t *conf, char *path)
char real_path[PATH_MAX_LENGTH];
config_file_t *sub_conf = NULL;
struct config_include_list *head = conf->includes;
struct config_include_list *node = (struct config_include_list*)calloc(1, sizeof(*node));
struct config_include_list *node = (struct config_include_list*)malloc(sizeof(*node));
node->path = NULL;
node->next = NULL;
if (node)
{
@ -365,23 +368,29 @@ error:
static config_file_t *config_file_new_internal(
const char *path, unsigned depth)
{
FILE *file = NULL;
struct config_file *conf = (struct config_file*)calloc(1, sizeof(*conf));
FILE *file = NULL;
struct config_file *conf = (struct config_file*)malloc(sizeof(*conf));
if (!conf)
return NULL;
conf->path = NULL;
conf->entries = NULL;
conf->tail = NULL;
conf->includes = NULL;
conf->include_depth = 0;
if (!path || !*path)
return conf;
if (path_is_directory(path))
goto error;
conf->path = strdup(path);
conf->path = strdup(path);
if (!conf->path)
goto error;
conf->include_depth = depth;
file = fopen(path, "r");
file = fopen(path, "r");
if (!file)
{
@ -392,9 +401,8 @@ static config_file_t *config_file_new_internal(
while (!feof(file))
{
struct config_entry_list *list = (struct config_entry_list*)
calloc(1, sizeof(*list));
char *line = NULL;
char *line = NULL;
struct config_entry_list *list = (struct config_entry_list*)malloc(sizeof(*list));
if (!list)
{
@ -403,7 +411,13 @@ static config_file_t *config_file_new_internal(
return NULL;
}
line = getaline(file);
list->readonly = false;
list->key_hash = 0;
list->key = NULL;
list->value = NULL;
list->next = NULL;
line = getaline(file);
if (!line)
{
@ -500,14 +514,17 @@ config_file_t *config_file_new_from_string(const char *from_string)
{
size_t i;
struct string_list *lines = NULL;
struct config_file *conf = (struct config_file*)calloc(1, sizeof(*conf));
struct config_file *conf = (struct config_file*)malloc(sizeof(*conf));
if (!conf)
return NULL;
if (!from_string)
return conf;
conf->path = NULL;
conf->path = NULL;
conf->entries = NULL;
conf->tail = NULL;
conf->includes = NULL;
conf->include_depth = 0;
lines = string_split(from_string, "\n");
@ -516,9 +533,8 @@ config_file_t *config_file_new_from_string(const char *from_string)
for (i = 0; i < lines->size; i++)
{
struct config_entry_list *list = (struct config_entry_list*)
calloc(1, sizeof(*list));
char* line = lines->elems[i].data;
struct config_entry_list *list = (struct config_entry_list*)malloc(sizeof(*list));
char *line = lines->elems[i].data;
if (!list)
{
@ -527,6 +543,12 @@ config_file_t *config_file_new_from_string(const char *from_string)
return NULL;
}
list->readonly = false;
list->key_hash = 0;
list->key = NULL;
list->value = NULL;
list->next = NULL;
if (line && conf)
{
if (*line && parse_line(conf, list, line))
@ -761,16 +783,21 @@ void config_set_string(config_file_t *conf, const char *key, const char *val)
return;
}
if (!val) return;
if (!val)
return;
entry = (struct config_entry_list*)calloc(1, sizeof(*entry));
if (!entry) return;
entry = (struct config_entry_list*)malloc(sizeof(*entry));
if (!entry)
return;
entry->key = strdup(key);
entry->value = strdup(val);
entry->readonly = false;
entry->key_hash = 0;
entry->key = strdup(key);
entry->value = strdup(val);
entry->next = NULL;
if (last)
last->next = entry;
last->next = entry;
else
conf->entries = entry;
}
@ -875,7 +902,7 @@ bool config_file_write(config_file_t *conf, const char *path)
{
FILE *file;
if (path)
if (path && !string_is_empty(path))
{
file = fopen(path, "w");
if (!file)