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

* Reduce snprintf calls to only formatting

Browse Source 
* More strlcpy usage, less strlcat
This commit is contained in:
libretroadmin 2023-06-21 09:37:55 +02:00
parent 22dc6aff5a
commit d4fc6c7ce6
2 changed files with 34 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
menu/cbs/menu_cbs_get_value.c
View File

@ -655,20 +655,24 @@ static void menu_action_setting_disp_set_label_cpu_policy(
const char *path,
char *s2, size_t len2)
{
size_t _len;
unsigned policyid = atoi(path);
cpu_scaling_driver_t **drivers = get_cpu_scaling_drivers(false);
cpu_scaling_driver_t *d = drivers[policyid];
size_t _len = snprintf(s2, len2, "%s %d",
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CPU_POLICY_ENTRY),
policyid);
*s = '\0';
*w = 0;
*s = '\0';
*w = 0;
if (d->affected_cpus)
snprintf(s2, len2, "%s %d [CPU(s) %s]", msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_CPU_POLICY_ENTRY), policyid,
d->affected_cpus);
else
snprintf(s2, len2, "%s %d", msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_CPU_POLICY_ENTRY), policyid);
{
_len += strlcpy(s2 + _len, " [CPU(s) ", len2 - _len);
_len += strlcpy(s2 + _len, d->affected_cpus, len2 - _len);
s2[ _len] = ']' ;
s2[++_len] = '\0';
}
}
static void menu_action_cpu_managed_freq_label(
@ -698,21 +702,9 @@ static void menu_action_cpu_managed_freq_label(
};
if (freq == 1)
{
s[0] = 'M';
s[1] = 'i';
s[2] = 'n';
s[3] = '.';
s[4] = '\0';
}
strlcpy(s, "Min.", len);
else if (freq == ~0U)
{
s[0] = 'M';
s[1] = 'a';
s[2] = 'x';
s[3] = '.';
s[4] = '\0';
}
strlcpy(s, "Max.", len);
else
snprintf(s, len, "%u MHz", freq / 1000);
}
@ -937,22 +929,24 @@ static void menu_action_setting_disp_set_label_cheat(
if (cheat_index < cheat_manager_get_buf_size())
{
size_t _len =
snprintf(s, len, "(%s) : ",
cheat_manager_get_code_state(cheat_index)
? msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ON)
: msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF));
if (cheat_manager_state.cheats[cheat_index].handler == CHEAT_HANDLER_TYPE_EMU)
snprintf(s, len, "(%s) : %s",
cheat_manager_get_code_state(cheat_index) ?
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ON) :
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF),
cheat_manager_get_code(cheat_index)
? cheat_manager_get_code(cheat_index) :
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE)
);
{
const char *code = cheat_manager_get_code(cheat_index);
strlcpy(s + _len,
code
? code
: msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE),
len - _len);
}
else
snprintf(s, len, "(%s) : %08X",
cheat_manager_get_code_state(cheat_index) ?
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ON) :
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF),
cheat_manager_state.cheats[cheat_index].address
);
snprintf(s + _len, len - _len, "%08X",
cheat_manager_state.cheats[cheat_index].address);
}
*w = 19;
strlcpy(s2, path, len2);

8
menu/cbs/menu_cbs_title.c
View File

@ -515,6 +515,7 @@ static int action_get_core_information_steam_list(
static int action_get_title_dropdown_input_description_common(
const char *input_name, unsigned port, char *s, size_t len)
{
size_t _len;
const char *input_label_ptr = input_name;
char input_label[256];
@ -537,10 +538,9 @@ static int action_get_title_dropdown_input_description_common(
sizeof(input_label));
/* Build title string */
snprintf(s, len, "%s %u - %s",
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT),
port + 1,
input_label);
_len = strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT), len);
_len += snprintf(s + _len, len - _len, " %u - ", port + 1);
_len += strlcpy (s + _len, input_label, len - _len);
return 1;
}