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

Cleanups/some code duplication removal

Browse Source
This commit is contained in:
libretroadmin 2023-07-15 15:14:26 +02:00
parent 2785d2d74b
commit e1af98cc43
2 changed files with 125 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
menu/cbs/menu_cbs_ok.c
View File

@ -560,8 +560,8 @@ static void action_ok_get_file_browser_start_path(
pending_selection = path_basename(current_path); pending_selection = path_basename(current_path);
/* Check if current path is valid */ /* Check if current path is valid */
if (path_is_directory(start_path) && if ( path_is_directory(start_path)
!string_is_empty(pending_selection)) && !string_is_empty(pending_selection))
current_path_valid = true; current_path_valid = true;
} }
@ -1170,8 +1170,8 @@ int generic_action_ok_displaylist_push(const char *path,
/* If this is the 'Start Directory' content /* If this is the 'Start Directory' content
* list, use last selected directory/file */ * list, use last selected directory/file */
if ((type == MENU_SETTING_ACTION_FAVORITES_DIR) && if ( (type == MENU_SETTING_ACTION_FAVORITES_DIR)
settings->bools.use_last_start_directory) && settings->bools.use_last_start_directory)
{ {
info_path = menu_driver_get_last_start_directory(); info_path = menu_driver_get_last_start_directory();
menu_driver_set_pending_selection( menu_driver_set_pending_selection(
@ -1217,7 +1217,8 @@ int generic_action_ok_displaylist_push(const char *path,
struct retro_system_info *sysinfo = &runloop_state_get_ptr()->system.info; struct retro_system_info *sysinfo = &runloop_state_get_ptr()->system.info;
const char *core_name = sysinfo ? sysinfo->library_name : NULL; const char *core_name = sysinfo ? sysinfo->library_name : NULL;
if (!string_is_empty(core_name) && !string_is_empty(settings->paths.directory_input_remapping)) if ( !string_is_empty(core_name)
&& !string_is_empty(settings->paths.directory_input_remapping))
{ {
fill_pathname_join_special(tmp, fill_pathname_join_special(tmp,
settings->paths.directory_input_remapping, core_name, sizeof(tmp)); settings->paths.directory_input_remapping, core_name, sizeof(tmp));
@ -3117,7 +3118,8 @@ static void menu_input_wifi_cb(void *userdata, const char *passphrase)
wifi_network_scan_t *scan = driver_wifi_get_ssids(); wifi_network_scan_t *scan = driver_wifi_get_ssids();
wifi_network_info_t *netinfo = &scan->net_list[idx]; wifi_network_info_t *netinfo = &scan->net_list[idx];
if (idx < RBUF_LEN(scan->net_list) && passphrase) if ( (idx < RBUF_LEN(scan->net_list))
&& passphrase)
{ {
/* Need to fill in the passphrase that we got from the user! */ /* Need to fill in the passphrase that we got from the user! */
strlcpy(netinfo->passphrase, passphrase, sizeof(netinfo->passphrase)); strlcpy(netinfo->passphrase, passphrase, sizeof(netinfo->passphrase));
@ -3624,8 +3626,8 @@ static int generic_action_ok_remap_file_operation(const char *path,
if (action_type < ACTION_OK_REMAP_FILE_REMOVE_CORE) if (action_type < ACTION_OK_REMAP_FILE_REMOVE_CORE)
{ {
if (!string_is_empty(remap_file_path) && if ( !string_is_empty(remap_file_path)
input_remapping_save_file(remap_file_path)) && input_remapping_save_file(remap_file_path))
{ {
switch (action_type) switch (action_type)
{ {
@ -5009,7 +5011,8 @@ void cb_generic_download(retro_task_t *task,
fill_pathname_join_special(shaderdir, dir_video_shader, fill_pathname_join_special(shaderdir, dir_video_shader,
dirname, sizeof(shaderdir)); dirname, sizeof(shaderdir));
if (!path_is_directory(shaderdir) && !path_mkdir(shaderdir)) if ( !path_is_directory(shaderdir)
&& !path_mkdir(shaderdir))
goto finish; goto finish;
dir_path = shaderdir; dir_path = shaderdir;
@ -5569,8 +5572,8 @@ static int action_ok_add_to_favorites(const char *path,
} }
/* >> core_name (continued) */ /* >> core_name (continued) */
if ( string_is_empty(core_name) && if ( string_is_empty(core_name)
!string_is_empty(sysinfo->library_name)) && !string_is_empty(sysinfo->library_name))
strlcpy(core_name, sysinfo->library_name, sizeof(core_name)); strlcpy(core_name, sysinfo->library_name, sizeof(core_name));
} }
@ -5691,15 +5694,17 @@ static int action_ok_add_to_favorites_playlist(const char *path,
} }
/* Replace "DETECT" with default_core_path + name if available */ /* Replace "DETECT" with default_core_path + name if available */
if (!string_is_empty(entry->core_path) && !string_is_empty(entry->core_name)) if ( !string_is_empty(entry->core_path)
&& !string_is_empty(entry->core_name))
{ {
if ( string_is_equal(entry->core_path, FILE_PATH_DETECT) && if ( string_is_equal(entry->core_path, FILE_PATH_DETECT)
string_is_equal(entry->core_name, FILE_PATH_DETECT)) && string_is_equal(entry->core_name, FILE_PATH_DETECT))
{ {
const char *default_core_path = playlist_get_default_core_path(playlist_curr); const char *default_core_path = playlist_get_default_core_path(playlist_curr);
const char *default_core_name = playlist_get_default_core_name(playlist_curr); const char *default_core_name = playlist_get_default_core_name(playlist_curr);
if (!string_is_empty(default_core_path) && !string_is_empty(default_core_name)) if ( !string_is_empty(default_core_path)
&& !string_is_empty(default_core_name))
{ {
strlcpy(core_path, default_core_path, sizeof(core_path)); strlcpy(core_path, default_core_path, sizeof(core_path));
strlcpy(core_name, default_core_name, sizeof(core_name)); strlcpy(core_name, default_core_name, sizeof(core_name));
@ -5713,7 +5718,8 @@ static int action_ok_add_to_favorites_playlist(const char *path,
} }
/* > core_path + core_name */ /* > core_path + core_name */
if (!string_is_empty(core_path) && !string_is_empty(core_name)) if ( !string_is_empty(core_path)
&& !string_is_empty(core_name))
{ {
core_info_t *core_info = NULL; core_info_t *core_info = NULL;
@ -5820,7 +5826,6 @@ static int action_ok_rdb_entry_submenu(const char *path,
{ {
union string_list_elem_attr attr; union string_list_elem_attr attr;
char new_label[PATH_MAX_LENGTH]; char new_label[PATH_MAX_LENGTH];
char new_path[PATH_MAX_LENGTH];
int ret = -1; int ret = -1;
char *rdb = NULL; char *rdb = NULL;
int len = 0; int len = 0;
@ -5830,7 +5835,7 @@ static int action_ok_rdb_entry_submenu(const char *path,
if (!label) if (!label)
return -1; return -1;
new_label[0] = new_path[0] = '\0'; new_label[0] = '\0';
string_list_initialize(&str_list); string_list_initialize(&str_list);
if (!string_split_noalloc(&str_list, label, "|")) if (!string_split_noalloc(&str_list, label, "|"))
@ -5851,20 +5856,17 @@ static int action_ok_rdb_entry_submenu(const char *path,
len += strlen(str_list.elems[2].data) + 1; len += strlen(str_list.elems[2].data) + 1;
string_list_append(&str_list2, str_list.elems[2].data, attr); string_list_append(&str_list2, str_list.elems[2].data, attr);
rdb = (char*)calloc(len, sizeof(char)); if (!(rdb = (char*)calloc(len, sizeof(char))))
if (!rdb)
goto end; goto end;
string_list_join_concat(rdb, len, &str_list2, "|"); string_list_join_concat(rdb, len, &str_list2, "|");
strlcpy(new_path, rdb, sizeof(new_path));
fill_pathname_join_delim(new_label, fill_pathname_join_delim(new_label,
msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST), msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST),
str_list.elems[0].data, '_', str_list.elems[0].data, '_',
sizeof(new_label)); sizeof(new_label));
ret = generic_action_ok_displaylist_push(new_path, NULL, ret = generic_action_ok_displaylist_push(rdb, NULL,
new_label, type, idx, entry_idx, new_label, type, idx, entry_idx,
ACTION_OK_DL_RDB_ENTRY_SUBMENU); ACTION_OK_DL_RDB_ENTRY_SUBMENU);
@ -6132,8 +6134,8 @@ static void netplay_refresh_rooms_cb(retro_task_t *task, void *task_data,
menu_entries_get_last_stack(&path, &label, &menu_type, &enum_idx, NULL); menu_entries_get_last_stack(&path, &label, &menu_type, &enum_idx, NULL);
/* Don't push the results if we left the netplay menu */ /* Don't push the results if we left the netplay menu */
if (!string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_TAB)) && if ( !string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_TAB))
!string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY))) && !string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY)))
return; return;
if (error) if (error)
@ -6213,8 +6215,8 @@ static void netplay_refresh_lan_cb(const void *data)
menu_entries_get_last_stack(&path, &label, &menu_type, &enum_idx, NULL); menu_entries_get_last_stack(&path, &label, &menu_type, &enum_idx, NULL);
/* Don't push the results if we left the netplay menu */ /* Don't push the results if we left the netplay menu */
if (!string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_TAB)) && if ( !string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_TAB))
!string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY))) && !string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY)))
return; return;
if (!hosts || !hosts->size) if (!hosts || !hosts->size)
@ -6984,10 +6986,10 @@ static int action_ok_push_dropdown_item_input_description(const char *path,
unsigned user_idx; unsigned user_idx;
unsigned btn_idx; unsigned btn_idx;
if (!settings || if ( !settings
(entry_type < MENU_SETTINGS_INPUT_DESC_BEGIN) || || (entry_type < MENU_SETTINGS_INPUT_DESC_BEGIN)
((remap_idx >= RARCH_CUSTOM_BIND_LIST_END) && || ((remap_idx >= RARCH_CUSTOM_BIND_LIST_END)
(remap_idx != RARCH_UNMAPPED))) && (remap_idx != RARCH_UNMAPPED)))
return -1; return -1;
/* Determine user/button indices */ /* Determine user/button indices */
@ -7652,8 +7654,8 @@ static int action_ok_core_restore_backup(const char *path,
* (otherwise user will be faced with 'no information * (otherwise user will be faced with 'no information
* available' when popping the stack - this would be * available' when popping the stack - this would be
* confusing/ugly) */ * confusing/ugly) */
if (task_push_core_restore(backup_path, dir_libretro, &core_loaded) && if ( task_push_core_restore(backup_path, dir_libretro, &core_loaded)
core_loaded) && core_loaded)
menu_entries_flush_stack(NULL, 0); menu_entries_flush_stack(NULL, 0);
return 0; return 0;
@ -7701,8 +7703,8 @@ int action_ok_core_lock(const char *path,
/* Need to fetch core name for error message */ /* Need to fetch core name for error message */
/* If core is found, use display name */ /* If core is found, use display name */
if (core_info_find(core_path, &core_info) && if ( core_info->display_name
core_info->display_name) && core_info_find(core_path, &core_info))
core_name = core_info->display_name; core_name = core_info->display_name;
/* If not, use core file name */ /* If not, use core file name */
else else
@ -7710,8 +7712,8 @@ int action_ok_core_lock(const char *path,
/* Build error message */ /* Build error message */
_len = strlcpy(msg, _len = strlcpy(msg,
msg_hash_to_str(lock ? msg_hash_to_str(lock
MSG_CORE_LOCK_FAILED : MSG_CORE_UNLOCK_FAILED), ? MSG_CORE_LOCK_FAILED : MSG_CORE_UNLOCK_FAILED),
sizeof(msg)); sizeof(msg));
if (!string_is_empty(core_name)) if (!string_is_empty(core_name))
@ -7762,8 +7764,8 @@ int action_ok_core_set_standalone_exempt(const char *path,
/* Need to fetch core name for error message */ /* Need to fetch core name for error message */
/* If core is found, use display name */ /* If core is found, use display name */
if (core_info_find(core_path, &core_info) && if ( core_info->display_name
core_info->display_name) && core_info_find(core_path, &core_info))
core_name = core_info->display_name; core_name = core_info->display_name;
/* If not, use core file name */ /* If not, use core file name */
else else
@ -7812,8 +7814,8 @@ static int action_ok_core_delete(const char *path,
/* Need to fetch core name for notification */ /* Need to fetch core name for notification */
/* If core is found, use display name */ /* If core is found, use display name */
if (core_info_find(core_path, &core_info) && if ( core_info->display_name
core_info->display_name) && core_info_find(core_path, &core_info))
core_name = core_info->display_name; core_name = core_info->display_name;
/* If not, use core file name */ /* If not, use core file name */
else else
@ -8729,18 +8731,18 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
{ {
BIND_ACTION_OK(cbs, action_ok_cheat); BIND_ACTION_OK(cbs, action_ok_cheat);
} }
else if ((type >= MENU_SETTINGS_CORE_OPTION_START) && else if ( (type >= MENU_SETTINGS_CORE_OPTION_START)
(type < MENU_SETTINGS_CHEEVOS_START)) && (type < MENU_SETTINGS_CHEEVOS_START))
{ {
BIND_ACTION_OK(cbs, action_ok_core_option_dropdown_list); BIND_ACTION_OK(cbs, action_ok_core_option_dropdown_list);
} }
else if ((type >= MENU_SETTINGS_INPUT_DESC_BEGIN) && else if ( (type >= MENU_SETTINGS_INPUT_DESC_BEGIN)
(type <= MENU_SETTINGS_INPUT_DESC_END)) && (type <= MENU_SETTINGS_INPUT_DESC_END))
{ {
BIND_ACTION_OK(cbs, action_ok_input_description_dropdown_box_list); BIND_ACTION_OK(cbs, action_ok_input_description_dropdown_box_list);
} }
else if ((type >= MENU_SETTINGS_INPUT_DESC_KBD_BEGIN) && else if ( (type >= MENU_SETTINGS_INPUT_DESC_KBD_BEGIN)
(type <= MENU_SETTINGS_INPUT_DESC_KBD_END)) && (type <= MENU_SETTINGS_INPUT_DESC_KBD_END))
{ {
BIND_ACTION_OK(cbs, action_ok_input_description_kbd_dropdown_box_list); BIND_ACTION_OK(cbs, action_ok_input_description_kbd_dropdown_box_list);
} }

166
menu/cbs/menu_cbs_sublabel.c
View File

@ -69,35 +69,27 @@
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) 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)
{ {
size_t _len;
core_info_t *core_info = NULL; core_info_t *core_info = NULL;
size_t _len =
strlcpy(s,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES), len);
s[ _len] = ':';
s[++_len] = ' ';
s[++_len] = '\0';
/* Search for specified core */ /* Search for specified core */
if (core_info_find(path, &core_info) && if ( core_info->licenses_list
core_info->licenses_list) && core_info_find(path, &core_info))
{ {
char tmp[MENU_SUBLABEL_MAX_LENGTH]; char tmp[MENU_SUBLABEL_MAX_LENGTH];
tmp[0] = '\0'; tmp[0] = '\0';
/* Add license text */ /* Add license text */
string_list_join_concat(tmp, sizeof(tmp), string_list_join_concat(tmp, sizeof(tmp),
core_info->licenses_list, ", "); core_info->licenses_list, ", ");
_len = strlcpy(s,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES), len);
s[ _len] = ':';
s[++_len] = ' ';
s[++_len] = '\0';
strlcpy(s + _len, tmp, len - _len); strlcpy(s + _len, tmp, len - _len);
} }
else else /* No license found - set to N/A */
{
/* No license found - set to N/A */
_len = strlcpy(s,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES), len);
s[ _len] = ':';
s[++_len] = ' ';
s[++_len] = '\0';
strlcpy(s + _len, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), len - _len); strlcpy(s + _len, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), len - _len);
}
return 1; return 1;
} }
@ -127,76 +119,76 @@ static int menu_action_sublabel_contentless_core(file_list_t *list,
(enum playlist_sublabel_last_played_date_separator_type) (enum playlist_sublabel_last_played_date_separator_type)
settings->uints.menu_timedate_date_separator; settings->uints.menu_timedate_date_separator;
if (!playlist_show_sublabels) if (playlist_show_sublabels)
return 0; {
/* Search for specified core */
if ( !core_info_find(core_path, &core_info)
|| !core_info->supports_no_game)
return 1;
/* Search for specified core */ /* Get corresponding contentless core info entry */
if ( !core_info_find(core_path, &core_info) menu_contentless_cores_get_info(core_info->core_file_id.str,
|| !core_info->supports_no_game) &entry);
return 1;
/* Get corresponding contentless core info entry */ if (!entry)
menu_contentless_cores_get_info(core_info->core_file_id.str, return 1;
&entry);
if (!entry) /* Determine which info we need to display */
return 1;
/* Determine which info we need to display */ /* > Runtime info is always omitted when using Ozone
* > Check if required runtime log is enabled */
/* > Runtime info is always omitted when using Ozone if ( ((playlist_sublabel_runtime_type == PLAYLIST_RUNTIME_PER_CORE)
* > Check if required runtime log is enabled */ && !content_runtime_log)
if ( ((playlist_sublabel_runtime_type == PLAYLIST_RUNTIME_PER_CORE) || ((playlist_sublabel_runtime_type == PLAYLIST_RUNTIME_AGGREGATE)
&& !content_runtime_log) && !content_runtime_log_aggregate)
|| ((playlist_sublabel_runtime_type == PLAYLIST_RUNTIME_AGGREGATE)
&& !content_runtime_log_aggregate)
#ifdef HAVE_OZONE #ifdef HAVE_OZONE
|| string_is_equal(menu_ident, "ozone") || string_is_equal(menu_ident, "ozone")
#endif #endif
) )
display_runtime = false; display_runtime = false;
#ifdef HAVE_MATERIALUI #ifdef HAVE_MATERIALUI
/* > License info is always displayed unless /* > License info is always displayed unless
* we are using GLUI with runtime info enabled */ * we are using GLUI with runtime info enabled */
if (display_runtime && string_is_equal(menu_ident, "glui")) if (display_runtime && string_is_equal(menu_ident, "glui"))
tmp[0 ] = '\0'; tmp[0 ] = '\0';
else else
#endif #endif
{
/* Display licenses */
strlcpy(s, entry->licenses_str, len);
tmp[0 ] = '\n';
tmp[1 ] = '\0';
}
if (display_runtime)
{
/* Check whether runtime info should be loaded
* from log file */
if (entry->runtime.status == CONTENTLESS_CORE_RUNTIME_UNKNOWN)
runtime_update_contentless_core(
core_path,
directory_runtime_log,
directory_playlist,
(playlist_sublabel_runtime_type == PLAYLIST_RUNTIME_PER_CORE),
playlist_sublabel_last_played_style,
menu_timedate_date_separator);
/* Check whether runtime info is valid */
if (entry->runtime.status == CONTENTLESS_CORE_RUNTIME_VALID)
{ {
size_t n = strlcat(tmp, entry->runtime.runtime_str, sizeof(tmp)); /* Display licenses */
strlcpy(s, entry->licenses_str, len);
tmp[0 ] = '\n';
tmp[1 ] = '\0';
}
if (n < 64 - 1) if (display_runtime)
{
/* Check whether runtime info should be loaded
* from log file */
if (entry->runtime.status == CONTENTLESS_CORE_RUNTIME_UNKNOWN)
runtime_update_contentless_core(
core_path,
directory_runtime_log,
directory_playlist,
(playlist_sublabel_runtime_type == PLAYLIST_RUNTIME_PER_CORE),
playlist_sublabel_last_played_style,
menu_timedate_date_separator);
/* Check whether runtime info is valid */
if (entry->runtime.status == CONTENTLESS_CORE_RUNTIME_VALID)
{ {
tmp[n ] = '\n'; size_t n = strlcat(tmp, entry->runtime.runtime_str, sizeof(tmp));
tmp[n+1] = '\0';
strlcat(tmp, entry->runtime.last_played_str, sizeof(tmp));
}
if (!string_is_empty(tmp)) if (n < 64 - 1)
strlcat(s, tmp, len); {
tmp[n ] = '\n';
tmp[n+1] = '\0';
strlcat(tmp, entry->runtime.last_played_str, sizeof(tmp));
}
if (!string_is_empty(tmp))
strlcat(s, tmp, len);
}
} }
} }
@ -1355,9 +1347,9 @@ static int action_bind_sublabel_cpu_policy_entry_list(
{ {
/* Displays info about the Policy entry */ /* Displays info about the Policy entry */
cpu_scaling_driver_t **drivers = get_cpu_scaling_drivers(false); cpu_scaling_driver_t **drivers = get_cpu_scaling_drivers(false);
int idx = atoi(path);
if (drivers) if (drivers)
{ {
int idx = atoi(path);
size_t _len = strlcpy(s, drivers[idx]->scaling_governor, len); 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); drivers[idx]->current_frequency / 1000);
@ -1613,6 +1605,7 @@ static int action_bind_sublabel_cheat_desc(
if (cheat_manager_state.cheats) if (cheat_manager_state.cheats)
{ {
/* TODO/FIXME - localize */
if (cheat_manager_state.cheats[offset].handler == CHEAT_HANDLER_TYPE_EMU) if (cheat_manager_state.cheats[offset].handler == CHEAT_HANDLER_TYPE_EMU)
strlcpy(s, "Emulator-Handled", len); strlcpy(s, "Emulator-Handled", len);
else else
@ -1980,35 +1973,28 @@ static int action_bind_sublabel_core_updater_entry(
{ {
core_updater_list_t *core_list = core_updater_list_get_cached(); core_updater_list_t *core_list = core_updater_list_get_cached();
const core_updater_list_entry_t *entry = NULL; const core_updater_list_entry_t *entry = NULL;
size_t _len =
strlcpy(s,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES), len);
s[ _len] = ':';
s[++_len] = ' ';
s[++_len] = '\0';
/* Search for specified core */ /* Search for specified core */
if ( core_list if ( core_list
&& core_updater_list_get_filename(core_list, path, &entry) && core_updater_list_get_filename(core_list, path, &entry)
&& entry->licenses_list) && entry->licenses_list)
{ {
size_t _len;
char tmp[MENU_SUBLABEL_MAX_LENGTH]; char tmp[MENU_SUBLABEL_MAX_LENGTH];
tmp[0] = '\0'; tmp[0] = '\0';
/* Add license text */ /* Add license text */
string_list_join_concat(tmp, sizeof(tmp), string_list_join_concat(tmp, sizeof(tmp),
entry->licenses_list, ", "); entry->licenses_list, ", ");
_len = strlcpy(s,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES), len);
s[ _len] = ':';
s[++_len] = ' ';
s[++_len] = '\0';
strlcpy(s + _len, tmp, len - _len); strlcpy(s + _len, tmp, len - _len);
} }
else else /* No license found - set to N/A */
{
/* No license found - set to N/A */
size_t _len = strlcpy(s,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES), len);
s[ _len] = ':';
s[++_len] = ' ';
s[++_len] = '\0';
strlcpy(s + _len, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), len - _len); strlcpy(s + _len, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), len - _len);
}
return 1; return 1;
} }
#endif #endif