mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-25 16:44:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace some snprintf calls

Browse Source
This commit is contained in:
libretroadmin 2023-05-02 00:12:04 +02:00
parent 3f9a85d997
commit e61f495b0a
1 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
menu/menu_displaylist.c
View File

@ -1920,9 +1920,10 @@ static unsigned menu_displaylist_parse_system_info(file_list_t *list)
if (memory_used != 0 && memory_total != 0) if (memory_used != 0 && memory_total != 0)
{ {
snprintf(tmp, sizeof(tmp), size_t _len = strlcpy(tmp, msg_hash_to_str(MSG_MEMORY),
"%s: %" PRIu64 "/%" PRIu64 " MB", sizeof(tmp));
msg_hash_to_str(MSG_MEMORY), snprintf(tmp + _len, sizeof(tmp) - _len,
": %" PRIu64 "/%" PRIu64 " MB",
BYTES_TO_MB(memory_used), BYTES_TO_MB(memory_used),
BYTES_TO_MB(memory_total) BYTES_TO_MB(memory_total)
); );
@ -6287,19 +6288,28 @@ static unsigned menu_displaylist_netplay_refresh_rooms(file_list_t *list)
{ {
if (!show_passworded) if (!show_passworded)
continue; continue;
snprintf(passworded, sizeof(passworded), "[%s] ", msg_room_pwd); strlcpy(passworded, "[", sizeof(passworded));
strlcat(passworded, msg_room_pwd, sizeof(passworded));
strlcat(passworded, "] ", sizeof(passworded));
} }
else else
*passworded = '\0'; *passworded = '\0';
strlcpy(buf, passworded, sizeof(buf));
strlcat(buf, room_type, sizeof(buf));
strlcat(buf, ": ", sizeof(buf));
strlcat(buf, room->nickname, sizeof(buf));
if (!room->lan && !string_is_empty(room->country)) if (!room->lan && !string_is_empty(room->country))
snprintf(country, sizeof(country), " (%s)", room->country); {
strlcpy(country, " (", sizeof(country));
strlcat(country, room->country, sizeof(country));
strlcat(country, ")", sizeof(country));
strlcat(buf, country, sizeof(buf));
}
else else
*country = '\0'; *country = '\0';
snprintf(buf, sizeof(buf), "%s%s: %s%s",
passworded, room_type, room->nickname, country);
if (menu_entries_append(list, buf, if (menu_entries_append(list, buf,
cnc_netplay_room, cnc_netplay_room,
MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM, MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM,
@ -11307,8 +11317,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
&& (max_users > 1) && (max_users > 1)
&& !settings->bools.menu_show_sublabels) && !settings->bools.menu_show_sublabels)
{ {
snprintf(desc_label, sizeof(desc_label), snprintf(desc_label, sizeof(desc_label), "%s [%s %u]",
"%s [%s %u]", descriptor, msg_val_port, port+1); descriptor, msg_val_port, port + 1);
strlcpy(descriptor, desc_label, sizeof(descriptor)); strlcpy(descriptor, desc_label, sizeof(descriptor));
} }
@ -11455,11 +11465,11 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
if (!string_is_empty(cd_info.serial)) if (!string_is_empty(cd_info.serial))
{ {
char serial[256]; char serial[256];
snprintf(serial, sizeof(serial), strlcpy(serial,
"%s#: %s",
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_SERIAL), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_SERIAL),
cd_info.serial sizeof(serial));
); strlcat(serial, "#: ", sizeof(serial));
strlcat(serial, cd_info.serial, sizeof(serial));
if (menu_entries_append(info->list, if (menu_entries_append(info->list,
serial, serial,
@ -11488,8 +11498,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
{ {
char release_date[256]; char release_date[256];
/* TODO/FIXME - Localize */ /* TODO/FIXME - Localize */
snprintf(release_date, sizeof(release_date), strlcpy(release_date, "Release Date: ",
"Release Date: %s", cd_info.release_date); sizeof(release_date));
strlcat(release_date, cd_info.release_date,
sizeof(release_date));
if (menu_entries_append(info->list, if (menu_entries_append(info->list,
release_date, release_date,
@ -11770,9 +11782,11 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
fgets(current_profile, PATH_MAX_LENGTH, profile); fgets(current_profile, PATH_MAX_LENGTH, profile);
pclose(profile); pclose(profile);
/* TODO/FIXME - localize */ /* TODO/FIXME - localize */
snprintf(text, sizeof(text), "Current profile: %s", strlcpy(text, "Current profile: ", sizeof(text));
current_profile); strlcat(text, current_profile, sizeof(text));
#else #else
{
size_t _len;
u32 currentClock = 0; u32 currentClock = 0;
if (hosversionBefore(8, 0, 0)) if (hosversionBefore(8, 0, 0))
pcvGetClockRate(PcvModule_CpuBus, &currentClock); pcvGetClockRate(PcvModule_CpuBus, &currentClock);
@ -11783,7 +11797,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
clkrstGetClockRate(&session, &currentClock); clkrstGetClockRate(&session, &currentClock);
clkrstCloseSession(&session); clkrstCloseSession(&session);
} }
snprintf(text, sizeof(text), "Current Clock: %i", currentClock); _len = strlcpy(text, "Current clock: ", sizeof(text));
snprintf(text + _len, sizeof(text) - _len, "%i", currentClock);
}
#endif #endif
if (menu_entries_append(info->list, if (menu_entries_append(info->list,
text, "", 0, MENU_INFO_MESSAGE, text, "", 0, MENU_INFO_MESSAGE,