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

Cut down on some strlcat usage where not necessary

This commit is contained in:
twinaphex 2019-09-18 04:58:52 +02:00
parent 1ced1b3f73
commit ed77d46cc9
2 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core_info.c
View File

@ -79,12 +79,14 @@ static void core_info_list_resolve_all_extensions(
for (i = 0; i < core_info_list->count; i++) for (i = 0; i < core_info_list->count; i++)
{ {
size_t copied;
if (!core_info_list->list[i].supported_extensions) if (!core_info_list->list[i].supported_extensions)
continue; continue;
strlcat(core_info_list->all_ext, copied = strlcat(core_info_list->all_ext,
core_info_list->list[i].supported_extensions, all_ext_len); core_info_list->list[i].supported_extensions, all_ext_len);
strlcat(core_info_list->all_ext, "|", all_ext_len); core_info_list->all_ext[copied] = '|';
core_info_list->all_ext[copied+1] = '\0';
} }
#ifdef HAVE_7ZIP #ifdef HAVE_7ZIP
strlcat(core_info_list->all_ext, "7z|", all_ext_len); strlcat(core_info_list->all_ext, "7z|", all_ext_len);

46
retroarch.c
View File

@ -14621,14 +14621,9 @@ void input_config_get_bind_string(char *buf, const struct retro_keybind *bind,
const struct retro_keybind *auto_bind, size_t size) const struct retro_keybind *auto_bind, size_t size)
{ {
int delim = 0; int delim = 0;
#ifndef RARCH_CONSOLE
char key[64];
char keybuf[64];
key[0] = keybuf[0] = '\0';
#endif
*buf = '\0'; *buf = '\0';
if (bind->joykey != NO_BTN) if (bind->joykey != NO_BTN)
input_config_get_bind_string_joykey(buf, "", bind, size); input_config_get_bind_string_joykey(buf, "", bind, size);
else if (bind->joyaxis != AXIS_NONE) else if (bind->joyaxis != AXIS_NONE)
@ -14642,17 +14637,27 @@ void input_config_get_bind_string(char *buf, const struct retro_keybind *bind,
delim = 1; delim = 1;
#ifndef RARCH_CONSOLE #ifndef RARCH_CONSOLE
input_keymaps_translate_rk_to_str(bind->key, key, sizeof(key));
if (string_is_equal(key, file_path_str(FILE_PATH_NUL)))
*key = '\0';
/*empty?*/
if (*key != '\0')
{ {
if (delim) char key[64];
strlcat(buf, ", ", size); key[0] = '\0';
snprintf(keybuf, sizeof(keybuf), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_KEY), key);
strlcat(buf, keybuf, size); input_keymaps_translate_rk_to_str(bind->key, key, sizeof(key));
delim = 1; if (string_is_equal(key, file_path_str(FILE_PATH_NUL)))
*key = '\0';
/*empty?*/
if (*key != '\0')
{
char keybuf[64];
keybuf[0] = '\0';
if (delim)
strlcat(buf, ", ", size);
snprintf(keybuf, sizeof(keybuf),
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_KEY), key);
strlcat(buf, keybuf, size);
delim = 1;
}
} }
#endif #endif
@ -21786,8 +21791,9 @@ static void retroarch_parse_input_and_config(int argc, char *argv[])
/* Copy the args into a buffer so launch arguments can be reused */ /* Copy the args into a buffer so launch arguments can be reused */
for (i = 0; i < (unsigned)argc; i++) for (i = 0; i < (unsigned)argc; i++)
{ {
strlcat(launch_arguments, argv[i], sizeof(launch_arguments)); size_t copied = strlcat(launch_arguments,
strlcat(launch_arguments, " ", sizeof(launch_arguments)); argv[i], sizeof(launch_arguments));
string_add_space_fast(launch_arguments, copied);
} }
string_trim_whitespace_left(launch_arguments); string_trim_whitespace_left(launch_arguments);
string_trim_whitespace_right(launch_arguments); string_trim_whitespace_right(launch_arguments);
@ -23433,7 +23439,9 @@ static bool retroarch_load_shader_preset_internal(
break; break;
fill_pathname_join(shader_path, shader_directory, special_name, PATH_MAX_LENGTH); fill_pathname_join(shader_path, shader_directory, special_name, PATH_MAX_LENGTH);
strlcat(shader_path, video_shader_get_preset_extension(types[i]), PATH_MAX_LENGTH); strlcat(shader_path,
video_shader_get_preset_extension(types[i]),
PATH_MAX_LENGTH);
} }
if (!path_is_valid(shader_path)) if (!path_is_valid(shader_path))