mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-29 00:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of superfluous wrapper function config_entry_exists

Browse Source
This commit is contained in:
libretroadmin 2022-07-19 21:00:40 +02:00
parent 4b5c7856e6
commit f994c0b371
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configuration.c
View File

@ -27,6 +27,7 @@
#include <retro_assert.h>
#include <string/stdstring.h>
#include <streams/file_stream.h>
#include <array/rhmap.h>
#ifdef HAVE_CONFIG_H
#include "config.h"
@ -3778,7 +3779,7 @@ static bool config_load_file(global_t *global,
frontend_driver_set_sustained_performance_mode(settings->bools.sustained_performance_mode);
recording_driver_update_streaming_url();
if (!config_entry_exists(conf, "user_language"))
if (!(bool)RHMAP_HAS_STR(conf->entries_map, "user_language"))
msg_hash_set_uint(MSG_HASH_USER_LANGUAGE, frontend_driver_get_user_language());
if (frontend_driver_has_gamemode() &&
@ -3796,8 +3797,8 @@ static bool config_load_file(global_t *global,
* history playlist size limit. (Have to do this, otherwise
* users with large custom history size limits may lose
* favourites entries when updating RetroArch...) */
if ( config_entry_exists(conf, "content_history_size") &&
!config_entry_exists(conf, "content_favorites_size"))
if ( (bool)RHMAP_HAS_STR(conf->entries_map, "content_history_size") &&
!(bool)RHMAP_HAS_STR(conf->entries_map, "content_favorites_size"))
{
if (settings->uints.content_history_size > 999)
settings->ints.content_favorites_size = -1;

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

@ -1369,11 +1369,6 @@ void config_file_dump(config_file_t *conf, FILE *file, bool sort)
}
}
bool config_entry_exists(config_file_t *conf, const char *entry)
{
return (bool)RHMAP_HAS_STR(conf->entries_map, entry);
}
bool config_get_entry_list_head(config_file_t *conf,
struct config_file_entry *entry)
{

2
libretro-common/include/file/config_file.h
View File

@ -120,8 +120,6 @@ bool config_append_file(config_file_t *conf, const char *path);
/* All extract functions return true when value is valid and exists.
* Returns false otherwise. */
bool config_entry_exists(config_file_t *conf, const char *entry);
struct config_entry_list
{
char *key;