mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-25 09:02:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid some warnings by using return value for config_get_int

Browse Source
This commit is contained in:
twinaphex 2016-05-24 23:53:35 +02:00
parent 20aa9ed25a
commit 5a4ada4311
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gfx/video_driver.c
View File

@ -1739,6 +1739,7 @@ void video_driver_default_settings(void)
void video_driver_load_settings(config_file_t *conf) void video_driver_load_settings(config_file_t *conf)
{ {
bool tmp_bool = false;
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
if (!conf) if (!conf)
@ -1746,10 +1747,14 @@ void video_driver_load_settings(config_file_t *conf)
CONFIG_GET_BOOL_BASE(conf, global, CONFIG_GET_BOOL_BASE(conf, global,
console.screen.gamma_correction, "gamma_correction"); console.screen.gamma_correction, "gamma_correction");
config_get_bool(conf, "flicker_filter_enable",
&global->console.flickerfilter_enable); if (config_get_bool(conf, "flicker_filter_enable",
config_get_bool(conf, "soft_filter_enable", &tmp_bool))
&global->console.softfilter_enable); global->console.flickerfilter_enable = tmp_bool;
if (config_get_bool(conf, "soft_filter_enable",
&tmp_bool))
global->console.softfilter_enable = tmp_bool;
CONFIG_GET_INT_BASE(conf, global, CONFIG_GET_INT_BASE(conf, global,
console.screen.soft_filter_index, console.screen.soft_filter_index,

9
input/input_autodetect.c
View File

@ -72,6 +72,7 @@ static void input_autoconfigure_joypad_conf(config_file_t *conf,
static int input_try_autoconfigure_joypad_from_conf(config_file_t *conf, static int input_try_autoconfigure_joypad_from_conf(config_file_t *conf,
autoconfig_params_t *params) autoconfig_params_t *params)
{ {
int tmp_int;
char ident[PATH_MAX_LENGTH] = {0}; char ident[PATH_MAX_LENGTH] = {0};
char input_driver[PATH_MAX_LENGTH] = {0}; char input_driver[PATH_MAX_LENGTH] = {0};
int input_vid = 0; int input_vid = 0;
@ -83,8 +84,12 @@ static int input_try_autoconfigure_joypad_from_conf(config_file_t *conf,
config_get_array(conf, "input_device", ident, sizeof(ident)); config_get_array(conf, "input_device", ident, sizeof(ident));
config_get_array(conf, "input_driver", input_driver, sizeof(input_driver)); config_get_array(conf, "input_driver", input_driver, sizeof(input_driver));
config_get_int (conf, "input_vendor_id", &input_vid);
config_get_int (conf, "input_product_id", &input_pid); if (config_get_int (conf, "input_vendor_id", &tmp_int))
input_vid = tmp_int;
if (config_get_int (conf, "input_product_id", &tmp_int))
input_pid = tmp_int;
/* Check for VID/PID */ /* Check for VID/PID */
if ( (params->vid == input_vid) if ( (params->vid == input_vid)