mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

(config_file.c) Rename config_get_entry_for_read() to config_get_entry() and add prev argument

Browse Source
This commit is contained in:
Higor Eurípedes 2015-06-14 11:43:26 -03:00
parent 72fa1c9d36
commit 2e9afbdb70
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -526,23 +526,34 @@ void config_file_free(config_file_t *conf)
free(conf); free(conf);
} }
static const struct config_entry_list *config_get_entry_for_read(config_file_t *conf, const char *key) static struct config_entry_list *config_get_entry(const config_file_t *conf,
const char *key, struct config_entry_list **prev)
{ {
struct config_entry_list *entry; struct config_entry_list *entry;
struct config_entry_lsit *previous;
uint32_t hash = djb2_calculate(key); uint32_t hash = djb2_calculate(key);
if (prev)
previous = *prev;
for (entry = conf->entries; entry; entry = entry->next) for (entry = conf->entries; entry; entry = entry->next)
{ {
if (hash == entry->key_hash && strcmp(key, entry->key) == 0) if (hash == entry->key_hash && strcmp(key, entry->key) == 0)
return entry; return entry;
previous = entry;
} }
if (*prev)
*prev = previous;
return NULL; return NULL;
} }
bool config_get_double(config_file_t *conf, const char *key, double *in) bool config_get_double(config_file_t *conf, const char *key, double *in)
{ {
const struct config_entry_list *entry = config_get_entry_for_read(conf, key); const struct config_entry_list *entry = config_get_entry(conf, key, NULL);
if (entry) if (entry)
*in = strtod(entry->value, NULL); *in = strtod(entry->value, NULL);
@ -552,7 +563,7 @@ bool config_get_double(config_file_t *conf, const char *key, double *in)
bool config_get_float(config_file_t *conf, const char *key, float *in) bool config_get_float(config_file_t *conf, const char *key, float *in)
{ {
const struct config_entry_list *entry = config_get_entry_for_read(conf, key); const struct config_entry_list *entry = config_get_entry(conf, key, NULL);
if (entry) if (entry)
{ {
@ -565,7 +576,7 @@ bool config_get_float(config_file_t *conf, const char *key, float *in)
bool config_get_int(config_file_t *conf, const char *key, int *in) bool config_get_int(config_file_t *conf, const char *key, int *in)
{ {
const struct config_entry_list *entry = config_get_entry_for_read(conf, key); const struct config_entry_list *entry = config_get_entry(conf, key, NULL);
errno = 0; errno = 0;
if (entry) if (entry)
@ -581,7 +592,7 @@ bool config_get_int(config_file_t *conf, const char *key, int *in)
bool config_get_uint64(config_file_t *conf, const char *key, uint64_t *in) bool config_get_uint64(config_file_t *conf, const char *key, uint64_t *in)
{ {
const struct config_entry_list *entry = config_get_entry_for_read(conf, key); const struct config_entry_list *entry = config_get_entry(conf, key, NULL);
errno = 0; errno = 0;
if (entry) if (entry)
@ -597,7 +608,7 @@ bool config_get_uint64(config_file_t *conf, const char *key, uint64_t *in)
bool config_get_uint(config_file_t *conf, const char *key, unsigned *in) bool config_get_uint(config_file_t *conf, const char *key, unsigned *in)
{ {
const struct config_entry_list *entry = config_get_entry_for_read(conf, key); const struct config_entry_list *entry = config_get_entry(conf, key, NULL);
errno = 0; errno = 0;
if (entry) if (entry)
@ -613,7 +624,7 @@ bool config_get_uint(config_file_t *conf, const char *key, unsigned *in)
bool config_get_hex(config_file_t *conf, const char *key, unsigned *in) bool config_get_hex(config_file_t *conf, const char *key, unsigned *in)
{ {
const struct config_entry_list *entry = config_get_entry_for_read(conf, key); const struct config_entry_list *entry = config_get_entry(conf, key, NULL);
errno = 0; errno = 0;
if (entry) if (entry)
@ -629,7 +640,7 @@ bool config_get_hex(config_file_t *conf, const char *key, unsigned *in)
bool config_get_char(config_file_t *conf, const char *key, char *in) bool config_get_char(config_file_t *conf, const char *key, char *in)
{ {
const struct config_entry_list *entry = config_get_entry_for_read(conf, key); const struct config_entry_list *entry = config_get_entry(conf, key, NULL);
if (entry) if (entry)
{ {
@ -644,7 +655,7 @@ bool config_get_char(config_file_t *conf, const char *key, char *in)
bool config_get_string(config_file_t *conf, const char *key, char **str) bool config_get_string(config_file_t *conf, const char *key, char **str)
{ {
const struct config_entry_list *entry = config_get_entry_for_read(conf, key); const struct config_entry_list *entry = config_get_entry(conf, key, NULL);
if (entry) if (entry)
*str = strdup(entry->value); *str = strdup(entry->value);
@ -655,7 +666,7 @@ bool config_get_string(config_file_t *conf, const char *key, char **str)
bool config_get_array(config_file_t *conf, const char *key, bool config_get_array(config_file_t *conf, const char *key,
char *buf, size_t size) char *buf, size_t size)
{ {
const struct config_entry_list *entry = config_get_entry_for_read(conf, key); const struct config_entry_list *entry = config_get_entry(conf, key, NULL);
if (entry) if (entry)
return strlcpy(buf, entry->value, size) < size; return strlcpy(buf, entry->value, size) < size;
@ -669,7 +680,7 @@ bool config_get_path(config_file_t *conf, const char *key,
#if defined(RARCH_CONSOLE) #if defined(RARCH_CONSOLE)
return config_get_array(conf, key, buf, size); return config_get_array(conf, key, buf, size);
#else #else
const struct config_entry_list *entry = config_get_entry_for_read(conf, key); const struct config_entry_list *entry = config_get_entry(conf, key, NULL);
if (entry) if (entry)
fill_pathname_expand_special(buf, entry->value, size); fill_pathname_expand_special(buf, entry->value, size);
@ -680,7 +691,7 @@ bool config_get_path(config_file_t *conf, const char *key,
bool config_get_bool(config_file_t *conf, const char *key, bool *in) bool config_get_bool(config_file_t *conf, const char *key, bool *in)
{ {
const struct config_entry_list *entry = config_get_entry_for_read(conf, key); const struct config_entry_list *entry = config_get_entry(conf, key, NULL);
if (entry) if (entry)
{ {