ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(MaterialUI/RGUI/XMB) Less snprintf calls 

(menu_displaylist.c) Do away with one less strlen by using
the return value of snprintf here instead
This commit is contained in:
LibretroAdmin 2022-08-29 14:38:26 +02:00
parent 08154e2656
commit ef0e9ccc38
4 changed files with 49 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
menu/drivers/materialui.c
View File

@ -3478,14 +3478,21 @@ static bool materialui_render_process_entry_playlist_desktop(
last_played_str = mui->status_bar.last_played_fallback_str;
/* Generate metadata string */
snprintf(mui->status_bar.str, sizeof(mui->status_bar.str),
"%s %s%s%s%s%s",
strlcpy(mui->status_bar.str,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_CORE),
core_name,
MUI_TICKER_SPACER,
runtime_str,
MUI_TICKER_SPACER,
last_played_str);
sizeof(mui->status_bar.str));
strlcat(mui->status_bar.str, " ",
sizeof(mui->status_bar.str));
strlcat(mui->status_bar.str, core_name,
sizeof(mui->status_bar.str));
strlcat(mui->status_bar.str, MUI_TICKER_SPACER,
sizeof(mui->status_bar.str));
strlcat(mui->status_bar.str, runtime_str,
sizeof(mui->status_bar.str));
strlcat(mui->status_bar.str, MUI_TICKER_SPACER,
sizeof(mui->status_bar.str));
strlcat(mui->status_bar.str, last_played_str,
sizeof(mui->status_bar.str));
/* All metadata is cached */
mui->status_bar.cached = true;
@ -7048,12 +7055,11 @@ static void materialui_frame(void *data, video_frame_info_t *video_info)
/* Handle onscreen keyboard */
if (menu_input_dialog_get_display_kb())
{
size_t _len;
char msg[255];
const char *str = menu_input_dialog_get_buffer();
const char *label = menu_input_dialog_get_label_buffer();
msg[0] = '\0';
/* Darken screen */
gfx_display_set_alpha(
mui->colors.screen_fade, mui->colors.screen_fade_opacity);
@ -7069,7 +7075,10 @@ static void materialui_frame(void *data, video_frame_info_t *video_info)
NULL);
/* Draw message box */
snprintf(msg, sizeof(msg), "%s\n%s", label, str);
_len = strlcpy(msg, label, sizeof(msg));
msg[_len ] = '\n';
msg[_len+1] = '\0';
strlcat(msg, str, sizeof(msg));
materialui_render_messagebox(mui,
p_disp,
userdata, video_width, video_height,
@ -7400,6 +7409,7 @@ static void materialui_status_bar_init(
if (mui->status_bar.enabled)
{
size_t _len;
/* Determine status bar height */
mui->status_bar.height = (unsigned)(((float)mui->font_data.hint.line_height * 1.6f) + 0.5f);
@ -7408,15 +7418,25 @@ static void materialui_status_bar_init(
* materialui_init()? Because re-caching the
* values each time allows us to handle changes
* in user interface language settings) */
snprintf(mui->status_bar.runtime_fallback_str,
sizeof(mui->status_bar.runtime_fallback_str), "%s %s",
_len = strlcpy(mui->status_bar.runtime_fallback_str,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_RUNTIME),
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DISABLED));
sizeof(mui->status_bar.runtime_fallback_str));
mui->status_bar.runtime_fallback_str[_len ] = ' ';
mui->status_bar.runtime_fallback_str[_len+1] = '\0';
strlcat(mui->status_bar.runtime_fallback_str,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DISABLED),
sizeof(mui->status_bar.runtime_fallback_str));
snprintf(mui->status_bar.last_played_fallback_str,
sizeof(mui->status_bar.last_played_fallback_str), "%s %s",
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED),
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DISABLED));
_len = strlcpy(mui->status_bar.last_played_fallback_str,
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_LAST_PLAYED),
sizeof(mui->status_bar.last_played_fallback_str));
mui->status_bar.last_played_fallback_str[_len ] = ' ';
mui->status_bar.last_played_fallback_str[_len+1] = '\0';
strlcat(mui->status_bar.last_played_fallback_str,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DISABLED),
sizeof(mui->status_bar.last_played_fallback_str)
);
}
}
@ -10740,8 +10760,8 @@ static void materialui_list_insert(
{
char val[255];
unsigned user_value = i + 1;
snprintf(val, sizeof(val), "%d_input_binds_list", user_value);
snprintf(val, sizeof(val), "%d", user_value);
strlcat(val, "_input_binds_list", sizeof(val));
if (string_is_equal(label, val))
{

6
menu/drivers/rgui.c
View File

@ -4488,8 +4488,10 @@ static void rgui_render_osk(
* If OSK cannot physically fit on the screen,
* fallback to old style 'message box' implementation */
char msg[255];
msg[0] = '\0';
snprintf(msg, sizeof(msg), "%s\n%s", input_label, input_str);
size_t _len = strlcpy(msg, input_label, sizeof(msg));
msg[_len ] = '\n';
msg[_len+1] = '\0';
strlcat(msg, input_str, sizeof(msg));
rgui_render_messagebox(rgui, msg, fb_width, fb_height);
return;
}

8
menu/drivers/xmb.c
View File

@ -1527,11 +1527,9 @@ static void xmb_selection_pointer_changed(
/* Update entry index text */
if (xmb->entry_idx_enabled)
{
snprintf(xmb->entry_index_str, sizeof(xmb->entry_index_str),
"%lu/%lu", (unsigned long)selection + 1,
(unsigned long)xmb->list_size);
}
ia = xmb->items_active_alpha;
iz = xmb->items_active_zoom;
@ -5883,8 +5881,10 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
{
const char *str = menu_input_dialog_get_buffer();
const char *label = menu_input_dialog_get_label_buffer();
snprintf(msg, sizeof(msg), "%s\n%s", label, str);
size_t _len = strlcpy(msg, label, sizeof(msg));
msg[_len ] = '\n';
msg[_len+1] = '\0';
strlcat(msg, str, sizeof(msg));
render_background = true;
}

4
menu/menu_displaylist.c
View File

@ -2420,8 +2420,8 @@ static int create_string_list_rdb_entry_int(
str_len += strlen(label) + 1;
string_list_append(&str_list, label, attr);
snprintf(str, sizeof(str), "%d", actual_int);
str_len += strlen(str) + 1;
_len = snprintf(str, sizeof(str), "%d", actual_int);
str_len += _len + 1;
string_list_append(&str_list, str, attr);
str_len += strlen(path) + 1;