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

Cleanups/variable cleanups/less snprintf calls

Browse Source
This commit is contained in:
libretroadmin 2023-04-17 15:26:30 +02:00
parent 0849a51ecc
commit 52ba0fce34
1 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
menu/menu_displaylist.c
View File

@ -11078,13 +11078,11 @@ static unsigned menu_displaylist_netplay_kick(file_list_t *list)
{ {
size_t i; size_t i;
char client_id[4]; char client_id[4];
netplay_client_info_t *client;
net_driver_state_t *net_st = networking_state_get_ptr(); net_driver_state_t *net_st = networking_state_get_ptr();
for (i = 0; i < net_st->client_info_count; i++) for (i = 0; i < net_st->client_info_count; i++)
{ {
client = &net_st->client_info[i]; netplay_client_info_t *client = &net_st->client_info[i];
snprintf(client_id, sizeof(client_id), "%d", client->id); snprintf(client_id, sizeof(client_id), "%d", client->id);
if (menu_entries_append(list, client->name, client_id, if (menu_entries_append(list, client->name, client_id,
MENU_ENUM_LABEL_NETPLAY_KICK_CLIENT, MENU_ENUM_LABEL_NETPLAY_KICK_CLIENT,
@ -11319,7 +11317,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
} }
{ {
unsigned retro_id, j; unsigned j;
unsigned device = settings->uints.input_libretro_device[mapped_port]; unsigned device = settings->uints.input_libretro_device[mapped_port];
device &= RETRO_DEVICE_MASK; device &= RETRO_DEVICE_MASK;
@ -11331,16 +11329,13 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
{ {
char desc_label[400]; char desc_label[400];
char descriptor[300]; char descriptor[300];
const struct retro_keybind *keybind; unsigned retro_id =
const struct retro_keybind *auto_bind;
retro_id =
(j < RARCH_ANALOG_BIND_LIST_END) (j < RARCH_ANALOG_BIND_LIST_END)
? input_config_bind_order[j] ? input_config_bind_order[j]
: j; : j;
keybind = const struct retro_keybind *keybind =
&input_config_binds[port][retro_id]; &input_config_binds[port][retro_id];
auto_bind = const struct retro_keybind *auto_bind =
(const struct retro_keybind*) (const struct retro_keybind*)
input_config_get_bind_auto(port, retro_id); input_config_get_bind_auto(port, retro_id);
@ -11386,16 +11381,13 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
{ {
char desc_label[400]; char desc_label[400];
char descriptor[300]; char descriptor[300];
const struct retro_keybind *keybind; unsigned retro_id =
const struct retro_keybind *auto_bind;
retro_id =
(j < RARCH_ANALOG_BIND_LIST_END) (j < RARCH_ANALOG_BIND_LIST_END)
? input_config_bind_order[j] ? input_config_bind_order[j]
: j; : j;
keybind = const struct retro_keybind *keybind =
&input_config_binds[port][retro_id]; &input_config_binds[port][retro_id];
auto_bind = const struct retro_keybind *auto_bind =
(const struct retro_keybind*) (const struct retro_keybind*)
input_config_get_bind_auto(port, retro_id); input_config_get_bind_auto(port, retro_id);
@ -11445,11 +11437,11 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
#ifdef HAVE_CDROM #ifdef HAVE_CDROM
case DISPLAYLIST_CDROM_DETAIL_INFO: case DISPLAYLIST_CDROM_DETAIL_INFO:
{ {
media_detect_cd_info_t cd_info = {{0}};
char file_path[PATH_MAX_LENGTH] = {0};
RFILE *file; RFILE *file;
char drive = info->path[0]; media_detect_cd_info_t cd_info = {{0}};
bool atip = false; char file_path[PATH_MAX_LENGTH] = {0};
char drive = info->path[0];
bool atip = false;
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
count = 0; count = 0;
@ -11991,17 +11983,26 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
char lbl_remove[128]; char lbl_remove[128];
char lbl_stop[128]; char lbl_stop[128];
char lbl_volume[128]; char lbl_volume[128];
unsigned id = info->type - MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_BEGIN; char mixer_stream_str[128];
unsigned id = info->type - MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_BEGIN;
lbl_remove[0] = lbl_stop[0] = lbl_play[0] = lbl_play_looped[0] = '\0'; lbl_remove[0] = lbl_stop[0] = lbl_play[0] = lbl_play_looped[0] = '\0';
lbl_volume[0] = lbl_play_sequential[0] = '\0'; lbl_volume[0] = lbl_play_sequential[0] = '\0';
mixer_stream_str[0] = '\0';
snprintf(lbl_volume, sizeof(lbl_volume), "mixer_stream_%d_action_volume", id); snprintf(mixer_stream_str, sizeof(mixer_stream_str), "mixer_stream_%d", id);
snprintf(lbl_stop, sizeof(lbl_stop), "mixer_stream_%d_action_stop", id); strlcpy(lbl_volume, mixer_stream_str, sizeof(lbl_volume));
snprintf(lbl_remove, sizeof(lbl_remove), "mixer_stream_%d_action_remove", id); strlcpy(lbl_stop, mixer_stream_str, sizeof(lbl_stop));
snprintf(lbl_play, sizeof(lbl_play), "mixer_stream_%d_action_play", id); strlcpy(lbl_remove, mixer_stream_str, sizeof(lbl_remove));
snprintf(lbl_play_looped, sizeof(lbl_play_looped), "mixer_stream_%d_action_play_looped", id); strlcpy(lbl_play, mixer_stream_str, sizeof(lbl_play));
snprintf(lbl_play_sequential, sizeof(lbl_play_sequential), "mixer_stream_%d_action_play_sequential", id); strlcpy(lbl_play_looped, mixer_stream_str, sizeof(lbl_play_looped));
strlcpy(lbl_play_sequential, mixer_stream_str, sizeof(lbl_play_sequential));
strlcat(lbl_volume, "_action_volume", sizeof(lbl_volume));
strlcat(lbl_stop, "_action_stop", sizeof(lbl_stop));
strlcat(lbl_remove, "_action_remove", sizeof(lbl_remove));
strlcat(lbl_play, "_action_play", sizeof(lbl_play));
strlcat(lbl_play_looped, "_action_play_looped", sizeof(lbl_play_looped));
strlcat(lbl_play_sequential, "_action_play_sequential",sizeof(lbl_play_sequential));
if (menu_entries_append(info->list, if (menu_entries_append(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_MIXER_ACTION_PLAY), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_MIXER_ACTION_PLAY),
@ -12060,8 +12061,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
| MD_FLAG_NEED_CLEAR; | MD_FLAG_NEED_CLEAR;
break; break;
case DISPLAYLIST_NETPLAY_LAN_SCAN_SETTINGS_LIST: case DISPLAYLIST_NETPLAY_LAN_SCAN_SETTINGS_LIST:
/* TODO/FIXME ? */
break;
case DISPLAYLIST_OPTIONS_MANAGEMENT: case DISPLAYLIST_OPTIONS_MANAGEMENT:
/* TODO/FIXME ? */ /* TODO/FIXME ? */
break; break;
@ -14376,15 +14375,13 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
break; break;
case DISPLAYLIST_PLAYLIST: case DISPLAYLIST_PLAYLIST:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
{ menu_displaylist_parse_playlist_generic(menu, info,
menu_displaylist_parse_playlist_generic(menu, info, settings,
settings, path_basename_nocompression(info->path),
path_basename_nocompression(info->path), info->path,
info->path, true, /* Is a collection */
true, /* Is a collection */ true, /* Enable sorting (if allowed by user config) */
true, /* Enable sorting (if allowed by user config) */ &ret);
&ret);
}
ret = 0; /* Why do we do this...? */ ret = 0; /* Why do we do this...? */
if (ret == 0) if (ret == 0)
@ -14588,12 +14585,11 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
msg_hash_to_str(MENU_ENUM_LABEL_NO_ITEMS), msg_hash_to_str(MENU_ENUM_LABEL_NO_ITEMS),
MENU_ENUM_LABEL_NO_ITEMS, MENU_ENUM_LABEL_NO_ITEMS,
MENU_SETTING_NO_ITEM, 0, 0, NULL); MENU_SETTING_NO_ITEM, 0, 0, NULL);
info->flags |= MD_FLAG_NEED_REFRESH
| MD_FLAG_NEED_PUSH;
if (string_is_equal(info->label, if (string_is_equal(info->label,
msg_hash_to_str(MENU_ENUM_LABEL_CORE_LIST))) msg_hash_to_str(MENU_ENUM_LABEL_CORE_LIST)))
info->flags |= MD_FLAG_PUSH_BUILTIN_CORES; info->flags |= MD_FLAG_PUSH_BUILTIN_CORES;
info->flags |= MD_FLAG_NEED_REFRESH
| MD_FLAG_NEED_PUSH;
break; break;
case DISPLAYLIST_DEFAULT: case DISPLAYLIST_DEFAULT:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);