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

Get rid of more instances of string_list in menu code

Browse Source
This commit is contained in:
libretroadmin 2024-06-15 07:06:36 +02:00
parent 7d1d8be14e
commit 9e71a566cc
3 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
menu/cbs/menu_cbs_get_value.c
View File

@ -16,7 +16,6 @@
#include <file/file_path.h>
#include <compat/strl.h>
#include <string/stdstring.h>
#include <lists/string_list.h>
#ifdef HAVE_CONFIG_H
#include "../../config.h"
@ -926,7 +925,7 @@ static void menu_action_setting_disp_set_label_cheat(
if (cheat_index < cheat_manager_get_buf_size())
{
size_t _len =
size_t _len =
snprintf(s, len, "(%s) : ",
cheat_manager_get_code_state(cheat_index)
? msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ON)
@ -935,8 +934,8 @@ static void menu_action_setting_disp_set_label_cheat(
if (cheat_manager_state.cheats[cheat_index].handler == CHEAT_HANDLER_TYPE_EMU)
{
const char *code = cheat_manager_get_code(cheat_index);
strlcpy(s + _len,
code
strlcpy(s + _len,
code
? code
: msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE),
len - _len);
@ -1184,10 +1183,10 @@ static void menu_action_setting_disp_set_label_menu_video_resolution(
#endif
{
if (!string_is_empty(desc))
snprintf(s, len, msg_hash_to_str(MSG_SCREEN_RESOLUTION_FORMAT_DESC),
snprintf(s, len, msg_hash_to_str(MSG_SCREEN_RESOLUTION_FORMAT_DESC),
width, height, desc);
else
snprintf(s, len, msg_hash_to_str(MSG_SCREEN_RESOLUTION_FORMAT_NO_DESC),
snprintf(s, len, msg_hash_to_str(MSG_SCREEN_RESOLUTION_FORMAT_NO_DESC),
width, height);
}
}
@ -2115,7 +2114,7 @@ static int menu_cbs_init_bind_get_string_representation_compare_type(
info_range_list_t info_list[] = {
#ifdef HAVE_AUDIOMIXER
{
MENU_SETTINGS_AUDIO_MIXER_STREAM_BEGIN,
MENU_SETTINGS_AUDIO_MIXER_STREAM_BEGIN,
MENU_SETTINGS_AUDIO_MIXER_STREAM_END,
menu_action_setting_audio_mixer_stream_name
},

7
menu/cbs/menu_cbs_start.c
View File

@ -15,7 +15,6 @@
#include <compat/strl.h>
#include <file/file_path.h>
#include <lists/string_list.h>
#include <string/stdstring.h>
#ifdef HAVE_CONFIG_H
@ -617,10 +616,10 @@ static int action_start_video_resolution(
#endif
{
if (!string_is_empty(desc))
snprintf(msg, sizeof(msg), msg_hash_to_str(MSG_SCREEN_RESOLUTION_RESETTING_DESC),
snprintf(msg, sizeof(msg), msg_hash_to_str(MSG_SCREEN_RESOLUTION_RESETTING_DESC),
width, height, desc);
else
snprintf(msg, sizeof(msg), msg_hash_to_str(MSG_SCREEN_RESOLUTION_RESETTING_NO_DESC),
snprintf(msg, sizeof(msg), msg_hash_to_str(MSG_SCREEN_RESOLUTION_RESETTING_NO_DESC),
width, height);
}
@ -665,7 +664,7 @@ static int action_start_core_updater_entry(
* information menu */
if ( core_list
&& core_updater_list_get_filename(core_list, path, &entry)
&& !string_is_empty(entry->local_core_path)
&& !string_is_empty(entry->local_core_path)
&& path_is_valid(entry->local_core_path))
return action_ok_push_core_information_list(
entry->local_core_path, label, type, idx, entry_idx);

64
menu/cbs/menu_cbs_sublabel.c
View File

@ -70,7 +70,7 @@
static int menu_action_sublabel_file_browser_core(file_list_t *list, unsigned type, unsigned i, const char *label, const char *path, char *s, size_t len)
{
core_info_t *core_info = NULL;
size_t _len =
size_t _len =
strlcpy(s,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES), len);
s[ _len] = ':';
@ -78,16 +78,18 @@ static int menu_action_sublabel_file_browser_core(file_list_t *list, unsigned ty
s[++_len] = '\0';
/* Search for specified core */
if (
if (
core_info_find(path, &core_info)
&& core_info->licenses_list)
{
char tmp[MENU_SUBLABEL_MAX_LENGTH];
tmp[0] = '\0';
unsigned i;
/* Add license text */
string_list_join_concat(tmp, sizeof(tmp),
core_info->licenses_list, ", ");
strlcpy(s + _len, tmp, len - _len);
for (i = 0; i < core_info->licenses_list->size; i++)
{
_len += strlcpy(s + _len, core_info->licenses_list->elems[i].data, len - _len);
if ((i + 1) < core_info->licenses_list->size)
_len += strlcpy(s + _len, ", ", len - _len);
}
}
else /* No license found - set to N/A */
strlcpy(s + _len, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), len - _len);
@ -1406,11 +1408,11 @@ static int action_bind_sublabel_systeminfo_controller_entry(
snprintf(tmp, sizeof(tmp),
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT_DEVICE_INFO),
input_config_get_device_display_name(controller)
? input_config_get_device_display_name(controller)
input_config_get_device_display_name(controller)
? input_config_get_device_display_name(controller)
: msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE),
input_config_get_device_display_name(controller)
? input_config_get_device_config_name(controller)
input_config_get_device_display_name(controller)
? input_config_get_device_config_name(controller)
: msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE),
input_config_get_device_vid(controller),
input_config_get_device_pid(controller));
@ -1444,7 +1446,7 @@ static int action_bind_sublabel_cpu_policy_entry_list(
{
int idx = atoi(path);
size_t _len = strlcpy(s, drivers[idx]->scaling_governor, len);
snprintf(s + _len, len - _len, " | Freq: %u MHz\n",
snprintf(s + _len, len - _len, " | Freq: %u MHz\n",
drivers[idx]->current_frequency / 1000);
return 0;
}
@ -1662,7 +1664,7 @@ static int action_bind_sublabel_input_remap_port(
MENU_ENTRY_INITIALIZE(entry);
entry.flags |= MENU_ENTRY_FLAG_LABEL_ENABLED;
entry.flags |= MENU_ENTRY_FLAG_LABEL_ENABLED;
menu_entry_get(&entry, 0, i, NULL, false);
@ -1731,7 +1733,7 @@ static int action_bind_sublabel_netplay_room(file_list_t *list,
": %s (%s)\n"
"%s: %s (%s)\n"
"%s: %s ",
!string_is_empty(room->retroarch_version)
!string_is_empty(room->retroarch_version)
? room->retroarch_version
: msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE),
(!string_is_empty(room->frontend) &&
@ -1964,8 +1966,8 @@ static int action_bind_sublabel_playlist_entry(
if ( !string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY))
&& !string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HISTORY_TAB))
&& !string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_FAVORITES_LIST))
&& !string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_FAVORITES_TAB))
&& !string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_PLAYLIST_LIST))
&& !string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_FAVORITES_TAB))
&& !string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_PLAYLIST_LIST))
&& !string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HORIZONTAL_MENU)))
return 0;
@ -2066,7 +2068,7 @@ static int action_bind_sublabel_core_updater_entry(
{
core_updater_list_t *core_list = core_updater_list_get_cached();
const core_updater_list_entry_t *entry = NULL;
size_t _len =
size_t _len =
strlcpy(s,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES), len);
s[ _len] = ':';
@ -2078,12 +2080,14 @@ static int action_bind_sublabel_core_updater_entry(
&& core_updater_list_get_filename(core_list, path, &entry)
&& entry->licenses_list)
{
char tmp[MENU_SUBLABEL_MAX_LENGTH];
tmp[0] = '\0';
unsigned i;
/* Add license text */
string_list_join_concat(tmp, sizeof(tmp),
entry->licenses_list, ", ");
strlcpy(s + _len, tmp, len - _len);
for (i = 0; i < entry->licenses_list->size; i++)
{
_len += strlcpy(s + _len, entry->licenses_list->elems[i].data, len - _len);
if ((i + 1) < entry->licenses_list->size)
_len += strlcpy(s + _len, ", ", len - _len);
}
}
else /* No license found - set to N/A */
strlcpy(s + _len, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), len - _len);
@ -5622,7 +5626,7 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
}
else
{
/* Per-port entries require string match against label.
/* Per-port entries require string match against label.
* Some cases may be detected above by "type", but not all. */
typedef struct info_single_list
{
@ -5678,7 +5682,7 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
{
MENU_ENUM_LABEL_INPUT_BIND_DEFAULTS_INDEX,
action_bind_sublabel_input_bind_defaults
},
},
};
const char* idx_placeholder = "%u";
@ -5686,13 +5690,13 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
{
int idxpos = -1;
idxpos = string_find_index_substring_string(msg_hash_to_str(info_list[i].label_idx), idx_placeholder);
if ( idxpos > 0 &&
string_starts_with_size(label, msg_hash_to_str(info_list[i].label_idx), idxpos) &&
(( (size_t) idxpos == strlen(msg_hash_to_str(info_list[i].label_idx)) - 2) ||
( (size_t) idxpos < strlen(msg_hash_to_str(info_list[i].label_idx)) - 2 &&
string_ends_with_size(label,
if ( idxpos > 0 &&
string_starts_with_size(label, msg_hash_to_str(info_list[i].label_idx), idxpos) &&
(( (size_t) idxpos == strlen(msg_hash_to_str(info_list[i].label_idx)) - 2) ||
( (size_t) idxpos < strlen(msg_hash_to_str(info_list[i].label_idx)) - 2 &&
string_ends_with_size(label,
msg_hash_to_str(info_list[i].label_idx)+idxpos+2,
lbl_len,
lbl_len,
strlen(msg_hash_to_str(info_list[i].label_idx))-idxpos-2))))
{
BIND_ACTION_SUBLABEL(cbs, info_list[i].cb);