mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

(menu_cbs_ok.c) Some cleanups, warning fixes, use strtok_r instead

Browse Source 
of strtok
This commit is contained in:
libretroadmin 2024-06-26 15:30:45 +02:00
parent 58e2e581ec
commit 6319fa30c3
1 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
menu/cbs/menu_cbs_ok.c
View File

@ -6845,9 +6845,8 @@ static int action_ok_push_dropdown_setting_uint_item_special(const char *path,
return action_cancel_pop_default(NULL, NULL, 0, 0);
}
static int generic_action_ok_dropdown_setting(const char *path, const char *label,
unsigned type, size_t idx)
unsigned type, size_t idx, size_t entry_idx)
{
enum msg_hash_enums enum_idx = (enum msg_hash_enums)atoi(label);
rarch_setting_t *setting = menu_setting_find_enum(enum_idx);
@ -6910,12 +6909,6 @@ static int generic_action_ok_dropdown_setting(const char *path, const char *labe
return action_cancel_pop_default(NULL, NULL, 0, 0);
}
static int action_ok_push_dropdown_setting(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
return generic_action_ok_dropdown_setting(path, label, type, idx);
}
static int action_ok_push_dropdown_item(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
@ -6925,22 +6918,24 @@ static int action_ok_push_dropdown_item(const char *path,
int action_cb_push_dropdown_item_resolution(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
char str[100];
char *pch = NULL;
char *save = NULL;
char *tok = NULL;
unsigned width = 0;
unsigned height = 0;
float refreshrate = 0.0f;
char *str = path ? strdup(path) : NULL;
strlcpy(str, path, sizeof(str));
pch = strtok(str, "x");
if (pch)
width = (unsigned)strtoul(pch, NULL, 0);
pch = strtok(NULL, " ");
if (pch)
height = (unsigned)strtoul(pch, NULL, 0);
pch = strtok(NULL, "(");
if (pch)
refreshrate = (float)strtod(pch, NULL);
if (!str)
return -1;
if ((tok = strtok_r(str, "x", &save)))
width = (unsigned)strtoul(tok, NULL, 0);
if ((tok = strtok_r(NULL, " ", &save)))
height = (unsigned)strtoul(tok, NULL, 0);
if ((tok = strtok_r(NULL, "(", &save)))
refreshrate = (float)strtod(tok, NULL);
free(str);
if (video_display_server_set_resolution(width, height,
floor(refreshrate), refreshrate, 0, 0, 0, 0))
@ -7304,6 +7299,7 @@ static int action_ok_push_dropdown_item_input_device_type(const char *path,
static int action_ok_push_dropdown_item_input_select_reserved_device(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
unsigned user;
const char *no_device;
const char *reserved_device_name;
enum msg_hash_enums enum_idx;
@ -7311,7 +7307,6 @@ static int action_ok_push_dropdown_item_input_select_reserved_device(const char
settings_t *settings = config_get_ptr();
const char *menu_path = NULL;
struct menu_state *menu_st = menu_state_get_ptr();
unsigned user;
menu_entries_get_last_stack(&menu_path, NULL, NULL, NULL, NULL);
enum_idx = (enum msg_hash_enums)atoi(menu_path);
@ -9243,7 +9238,7 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
case MENU_SETTING_DROPDOWN_SETTING_STRING_OPTIONS_ITEM_SPECIAL:
case MENU_SETTING_DROPDOWN_SETTING_INT_ITEM_SPECIAL:
case MENU_SETTING_DROPDOWN_SETTING_FLOAT_ITEM_SPECIAL:
BIND_ACTION_OK(cbs, action_ok_push_dropdown_setting);
BIND_ACTION_OK(cbs, generic_action_ok_dropdown_setting);
break;
case MENU_SETTING_DROPDOWN_SETTING_UINT_ITEM_SPECIAL:
BIND_ACTION_OK(cbs, action_ok_push_dropdown_setting_uint_item_special);