Skip to content

Commit 5ddd446

Browse files
libretroadminLibretroAdmin
libretroadmin
authored and
LibretroAdmin
committed
setting_list: rename the select tuple member, sweep the dead locals
net_compat.h defines select as a five-argument macro on platforms without a native one, so the action tuple's select member broke every consumer that included the networking headers first - the Wii build found it. The member is sel now, with the reason documented at the declaration, and a syntax lane that pre-defines select the way net_compat does keeps the token from ever coming back. Also swept by the same build log: an orphaned viewport local in the video builder, and one shadowed function-scope user declaration each in the input and netplay builders whose every use bound to an inner block-scope twin. Both validation dumps byte-identical across the full coverage; the settings dump prints tags derived from these very tuples.
1 parent 1cf6ad0 commit 5ddd446

2 files changed

Lines changed: 28 additions & 27 deletions

File tree

‎menu/menu_setting.c‎

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ static void setting_add_special_callbacks(
707707
if (values & SD_FLAG_ALLOW_INPUT)
708708
{
709709
SETTINGS_ACTION_SET(ok, &(*list)[idx], setting_generic_action_ok_linefeed)
710-
SETTINGS_ACTION_SET(select, &(*list)[idx], setting_generic_action_ok_linefeed)
710+
SETTINGS_ACTION_SET(sel, &(*list)[idx], setting_generic_action_ok_linefeed)
711711

712712
switch ((*list)[idx].type)
713713
{
@@ -1388,7 +1388,7 @@ static rarch_setting_t setting_action_setting(const char* name,
13881388
memset(&_t, 0, sizeof(_t));
13891389
_t.ok = setting_action_action_ok;
13901390
_t.start = NULL;
1391-
_t.select = setting_action_action_ok;
1391+
_t.sel = setting_action_action_ok;
13921392
_t.left = NULL;
13931393
_t.right = NULL;
13941394
_t.change = NULL;
@@ -1449,7 +1449,7 @@ static rarch_setting_t setting_group_setting(
14491449
memset(&_t, 0, sizeof(_t));
14501450
_t.ok = NULL;
14511451
_t.start = NULL;
1452-
_t.select = NULL;
1452+
_t.sel = NULL;
14531453
_t.left = NULL;
14541454
_t.right = NULL;
14551455
_t.change = NULL;
@@ -1523,7 +1523,7 @@ static rarch_setting_t setting_float_setting(const char* name,
15231523
memset(&_t, 0, sizeof(_t));
15241524
_t.ok = setting_generic_action_ok_default;
15251525
_t.start = setting_generic_action_start_default;
1526-
_t.select = setting_generic_action_ok_default;
1526+
_t.sel = setting_generic_action_ok_default;
15271527
_t.left = setting_fraction_action_left_default;
15281528
_t.right = setting_fraction_action_right_default;
15291529
_t.change = change_handler;
@@ -1596,7 +1596,7 @@ static rarch_setting_t setting_uint_setting(const char* name,
15961596
memset(&_t, 0, sizeof(_t));
15971597
_t.ok = setting_generic_action_ok_default;
15981598
_t.start = setting_generic_action_start_default;
1599-
_t.select = setting_generic_action_ok_default;
1599+
_t.sel = setting_generic_action_ok_default;
16001600
_t.left = setting_uint_action_left_default;
16011601
_t.right = setting_uint_action_right_default;
16021602
_t.change = change_handler;
@@ -1671,7 +1671,7 @@ static rarch_setting_t setting_size_setting(const char* name,
16711671
memset(&_t, 0, sizeof(_t));
16721672
_t.ok = setting_generic_action_ok_default;
16731673
_t.start = setting_generic_action_start_default;
1674-
_t.select = setting_generic_action_ok_default;
1674+
_t.sel = setting_generic_action_ok_default;
16751675
_t.left = setting_size_action_left_default;
16761676
_t.right = setting_size_action_right_default;
16771677
_t.change = change_handler;
@@ -1745,7 +1745,7 @@ static rarch_setting_t setting_bind_setting(const char* name,
17451745
memset(&_t, 0, sizeof(_t));
17461746
_t.ok = setting_bind_action_ok;
17471747
_t.start = setting_bind_action_start;
1748-
_t.select = setting_bind_action_ok;
1748+
_t.sel = setting_bind_action_ok;
17491749
_t.left = NULL;
17501750
_t.right = NULL;
17511751
_t.change = NULL;
@@ -1878,7 +1878,7 @@ static rarch_setting_t setting_string_setting(enum setting_type type,
18781878
memset(&_t, 0, sizeof(_t));
18791879
_t.ok = NULL;
18801880
_t.start = setting_string_action_start_generic;
1881-
_t.select = NULL;
1881+
_t.sel = NULL;
18821882
_t.left = NULL;
18831883
_t.right = NULL;
18841884
_t.change = change_handler;
@@ -1978,7 +1978,7 @@ static rarch_setting_t setting_subgroup_setting(enum setting_type type,
19781978
memset(&_t, 0, sizeof(_t));
19791979
_t.ok = NULL;
19801980
_t.start = NULL;
1981-
_t.select = NULL;
1981+
_t.sel = NULL;
19821982
_t.left = NULL;
19831983
_t.right = NULL;
19841984
_t.change = NULL;
@@ -2053,7 +2053,7 @@ static rarch_setting_t setting_bool_setting(const char* name,
20532053
memset(&_t, 0, sizeof(_t));
20542054
_t.ok = setting_bool_action_ok_default;
20552055
_t.start = setting_generic_action_start_default;
2056-
_t.select = setting_generic_action_ok_default;
2056+
_t.sel = setting_generic_action_ok_default;
20572057
_t.left = setting_bool_action_ok_default;
20582058
_t.right = setting_bool_action_ok_default;
20592059
_t.change = change_handler;
@@ -2126,7 +2126,7 @@ static rarch_setting_t setting_int_setting(const char* name,
21262126
memset(&_t, 0, sizeof(_t));
21272127
_t.ok = setting_generic_action_ok_default;
21282128
_t.start = setting_generic_action_start_default;
2129-
_t.select = setting_generic_action_ok_default;
2129+
_t.sel = setting_generic_action_ok_default;
21302130
_t.left = setting_int_action_left_default;
21312131
_t.right = setting_int_action_right_default;
21322132
_t.change = change_handler;
@@ -7850,8 +7850,8 @@ int menu_action_handle_setting(rarch_setting_t *setting,
78507850
ret = setting->actions->right(setting, selection, false);
78517851
break;
78527852
case MENU_ACTION_SELECT:
7853-
if (setting->actions->select)
7854-
ret = setting->actions->select(setting, selection, true);
7853+
if (setting->actions->sel)
7854+
ret = setting->actions->sel(setting, selection, true);
78557855
break;
78567856
case MENU_ACTION_OK:
78577857
if (setting->actions->ok)
@@ -10553,7 +10553,7 @@ static void settings_list_add_desc(
1055310553
if (d->action_start)
1055410554
SETTINGS_ACTION_SET(start, &(*list)[list_info->index - 1], d->action_start)
1055510555
if (d->action_select)
10556-
SETTINGS_ACTION_SET(select, &(*list)[list_info->index - 1], d->action_select)
10556+
SETTINGS_ACTION_SET(sel, &(*list)[list_info->index - 1], d->action_select)
1055710557
if (d->action_left)
1055810558
SETTINGS_ACTION_SET(left, &(*list)[list_info->index - 1], d->action_left)
1055910559
if (d->action_right)
@@ -10666,7 +10666,7 @@ static bool setting_append_list_input_player_options(
1066610666
SETTINGS_ACTION_SET(start, &(*list)[list_info->index - 1], &setting_action_start_input_device_index)
1066710667
SETTINGS_ACTION_SET(left, &(*list)[list_info->index - 1], &setting_action_left_input_device_index)
1066810668
SETTINGS_ACTION_SET(right, &(*list)[list_info->index - 1], &setting_action_right_input_device_index)
10669-
SETTINGS_ACTION_SET(select, &(*list)[list_info->index - 1], &setting_action_right_input_device_index)
10669+
SETTINGS_ACTION_SET(sel, &(*list)[list_info->index - 1], &setting_action_right_input_device_index)
1067010670
SETTINGS_ACTION_SET(ok, &(*list)[list_info->index - 1], &setting_action_ok_uint)
1067110671
SETTINGS_ACTION_SET(repr, &(*list)[list_info->index - 1], &get_string_representation_input_device_index)
1067210672
menu_settings_list_current_add_range(list, list_info, 0, MAX_INPUT_DEVICES - 1, 1.0, true, true);
@@ -10712,7 +10712,7 @@ static bool setting_append_list_input_player_options(
1071210712
SETTINGS_ACTION_SET(start, &(*list)[list_info->index - 1], &setting_action_start_input_mouse_index)
1071310713
SETTINGS_ACTION_SET(left, &(*list)[list_info->index - 1], &setting_action_left_input_mouse_index)
1071410714
SETTINGS_ACTION_SET(right, &(*list)[list_info->index - 1], &setting_action_right_input_mouse_index)
10715-
SETTINGS_ACTION_SET(select, &(*list)[list_info->index - 1], &setting_action_right_input_mouse_index)
10715+
SETTINGS_ACTION_SET(sel, &(*list)[list_info->index - 1], &setting_action_right_input_mouse_index)
1071610716
SETTINGS_ACTION_SET(ok, &(*list)[list_info->index - 1], &setting_action_ok_uint)
1071710717
SETTINGS_ACTION_SET(repr, &(*list)[list_info->index - 1], &get_string_representation_input_mouse_index)
1071810718
menu_settings_list_current_add_range(list, list_info, 0, MAX_INPUT_DEVICES - 1, 1.0, true, true);
@@ -10734,7 +10734,7 @@ static bool setting_append_list_input_player_options(
1073410734
(*list)[list_info->index - 1].index_offset = user;
1073510735
SETTINGS_ACTION_SET(left, &(*list)[list_info->index - 1], &setting_action_left_analog_dpad_mode)
1073610736
SETTINGS_ACTION_SET(right, &(*list)[list_info->index - 1], &setting_action_right_analog_dpad_mode)
10737-
SETTINGS_ACTION_SET(select, &(*list)[list_info->index - 1], &setting_action_right_analog_dpad_mode)
10737+
SETTINGS_ACTION_SET(sel, &(*list)[list_info->index - 1], &setting_action_right_analog_dpad_mode)
1073810738
SETTINGS_ACTION_SET(ok, &(*list)[list_info->index - 1], &setting_action_ok_uint)
1073910739
SETTINGS_ACTION_SET(repr, &(*list)[list_info->index - 1], &setting_get_string_representation_uint_analog_dpad_mode)
1074010740
menu_settings_list_current_add_range(list, list_info, 0, ANALOG_DPAD_LAST-1, 1.0, true, true);
@@ -10757,7 +10757,7 @@ static bool setting_append_list_input_player_options(
1075710757
SETTINGS_ACTION_SET(start, &(*list)[list_info->index - 1], &setting_action_start_input_device_reservation_type)
1075810758
SETTINGS_ACTION_SET(left, &(*list)[list_info->index - 1], &setting_action_left_input_device_reservation_type)
1075910759
SETTINGS_ACTION_SET(right, &(*list)[list_info->index - 1], &setting_action_right_input_device_reservation_type)
10760-
SETTINGS_ACTION_SET(select, &(*list)[list_info->index - 1], &setting_action_right_input_device_reservation_type)
10760+
SETTINGS_ACTION_SET(sel, &(*list)[list_info->index - 1], &setting_action_right_input_device_reservation_type)
1076110761
SETTINGS_ACTION_SET(ok, &(*list)[list_info->index - 1], &setting_action_ok_uint)
1076210762
SETTINGS_ACTION_SET(repr, &(*list)[list_info->index - 1], &get_string_representation_input_device_reservation_type)
1076310763
menu_settings_list_current_add_range(list, list_info, 0, INPUT_DEVICE_RESERVATION_LAST - 1, 1.0, true, true);
@@ -10963,7 +10963,7 @@ static bool setting_append_list_input_libretro_device_options(
1096310963
(*list)[list_info->index - 1].index_offset = user;
1096410964
SETTINGS_ACTION_SET(left, &(*list)[list_info->index - 1], &setting_action_left_libretro_device_type)
1096510965
SETTINGS_ACTION_SET(right, &(*list)[list_info->index - 1], &setting_action_right_libretro_device_type)
10966-
SETTINGS_ACTION_SET(select, &(*list)[list_info->index - 1], &setting_action_right_libretro_device_type)
10966+
SETTINGS_ACTION_SET(sel, &(*list)[list_info->index - 1], &setting_action_right_libretro_device_type)
1096710967
SETTINGS_ACTION_SET(start, &(*list)[list_info->index - 1], &setting_action_start_libretro_device_type)
1096810968
SETTINGS_ACTION_SET(ok, &(*list)[list_info->index - 1], &setting_action_ok_libretro_device_type)
1096910969
SETTINGS_ACTION_SET(repr, &(*list)[list_info->index - 1], &setting_get_string_representation_uint_libretro_device)
@@ -11029,7 +11029,7 @@ static bool setting_append_list_input_remap_port_options(
1102911029
(*list)[list_info->index - 1].index_offset = user;
1103011030
SETTINGS_ACTION_SET(left, &(*list)[list_info->index - 1], &setting_action_left_input_remap_port)
1103111031
SETTINGS_ACTION_SET(right, &(*list)[list_info->index - 1], &setting_action_right_input_remap_port)
11032-
SETTINGS_ACTION_SET(select, &(*list)[list_info->index - 1], &setting_action_right_input_remap_port)
11032+
SETTINGS_ACTION_SET(sel, &(*list)[list_info->index - 1], &setting_action_right_input_remap_port)
1103311033
SETTINGS_ACTION_SET(start, &(*list)[list_info->index - 1], &setting_action_start_input_remap_port)
1103411034
SETTINGS_ACTION_SET(ok, &(*list)[list_info->index - 1], &setting_action_ok_uint)
1103511035
SETTINGS_ACTION_SET(repr, &(*list)[list_info->index - 1], &setting_get_string_representation_uint_input_remap_port)
@@ -14185,7 +14185,6 @@ static void settings_build_video(
1418514185
(void)settings; (void)global; (void)group_info; (void)subgroup_info;
1418614186
{
1418714187

14188-
struct video_viewport *custom_vp = &settings->video_vp_custom;
1418914188
START_GROUP(list, list_info, &group_info,
1419014189
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SETTINGS),
1419114190
parent_group);
@@ -14364,7 +14363,7 @@ static void settings_build_video(
1436414363
general_read_handler);
1436514364
SETTINGS_ACTION_SET(start, &(*list)[list_info->index - 1], &setting_action_start_video_refresh_rate_polled)
1436614365
SETTINGS_ACTION_SET(ok, &(*list)[list_info->index - 1], &setting_action_ok_video_refresh_rate_polled)
14367-
SETTINGS_ACTION_SET(select, &(*list)[list_info->index - 1], &setting_action_ok_video_refresh_rate_polled)
14366+
SETTINGS_ACTION_SET(sel, &(*list)[list_info->index - 1], &setting_action_ok_video_refresh_rate_polled)
1436814367
SETTINGS_ACTION_SET(repr, &(*list)[list_info->index - 1], &setting_get_string_representation_st_float_video_refresh_rate_polled)
1436914368
SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED);
1437014369
}
@@ -15034,7 +15033,6 @@ static void settings_build_input(
1503415033
rarch_setting_t **list, rarch_setting_info_t *list_info,
1503515034
const char *parent_group)
1503615035
{
15037-
unsigned user;
1503815036
rarch_setting_group_info_t group_info;
1503915037
rarch_setting_group_info_t subgroup_info;
1504015038
group_info.name = NULL;
@@ -17217,7 +17215,6 @@ static void settings_build_netplay(
1721717215
rarch_setting_t **list, rarch_setting_info_t *list_info,
1721817216
const char *parent_group)
1721917217
{
17220-
unsigned user;
1722117218
rarch_setting_group_info_t group_info;
1722217219
rarch_setting_group_info_t subgroup_info;
1722317220
group_info.name = NULL;
@@ -18962,9 +18959,9 @@ static void menu_setting_validation_dump(rarch_setting_t *list)
1896218959
strt_tag = "D";
1896318960
else if (s->actions->start)
1896418961
strt_tag = "C";
18965-
if (s->actions->select == setting_generic_action_ok_default)
18962+
if (s->actions->sel == setting_generic_action_ok_default)
1896618963
sel_tag = "D";
18967-
else if (s->actions->select)
18964+
else if (s->actions->sel)
1896818965
sel_tag = "C";
1896918966

1897018967
dflt[0] = '\0';

‎setting_list.h‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,11 @@ struct setting_actions
119119
{
120120
action_ok_handler_t ok;
121121
action_start_handler_t start;
122-
action_select_handler_t select;
122+
/* Named sel, not select: net_compat.h defines select as a
123+
* five-argument macro on platforms without a native one, and a
124+
* member of that name breaks every consumer that includes the
125+
* networking headers first - the Wii found this the hard way. */
126+
action_select_handler_t sel;
123127
action_left_handler_t left;
124128
action_right_handler_t right;
125129
change_handler_t change;

0 commit comments

Comments
 (0)