From 440c7a5ddfa66c3bbd48e4c32601867bd995f8f4 Mon Sep 17 00:00:00 2001 From: libretroadmin Date: Mon, 5 Dec 2022 13:24:47 +0100 Subject: [PATCH] core_info_list_resolve_all_extensions - just use strlcat in here --- core_info.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/core_info.c b/core_info.c index 18b26d4480..f9e571a7ef 100644 --- a/core_info.c +++ b/core_info.c @@ -1879,7 +1879,6 @@ static void core_info_parse_config_file( static void core_info_list_resolve_all_extensions( core_info_list_t *core_info_list) { - size_t _len = 0; size_t i = 0; size_t all_ext_len = 0; char *all_ext = NULL; @@ -1891,8 +1890,7 @@ static void core_info_list_resolve_all_extensions( (strlen(core_info_list->list[i].supported_extensions) + 2); } - all_ext_len += STRLEN_CONST("7z|") + STRLEN_CONST("zip|"); - + all_ext_len += STRLEN_CONST("7z|") + STRLEN_CONST("zip|"); if (!(all_ext = (char*)calloc(1, all_ext_len))) return; @@ -1903,23 +1901,15 @@ static void core_info_list_resolve_all_extensions( if (!core_info_list->list[i].supported_extensions) continue; - strlcat(core_info_list->all_ext, + strlcat(core_info_list->all_ext, core_info_list->list[i].supported_extensions, all_ext_len); - _len = strlcat(core_info_list->all_ext, "|", all_ext_len); + strlcat(core_info_list->all_ext, "|", all_ext_len); } #ifdef HAVE_7ZIP - core_info_list->all_ext[_len ] = '7'; - core_info_list->all_ext[_len+1] = 'z'; - core_info_list->all_ext[_len+2] = '|'; - core_info_list->all_ext[_len+3] = '\0'; - _len += 3; + strlcat(core_info_list->all_ext, "7z|", all_ext_len); #endif #ifdef HAVE_ZLIB - core_info_list->all_ext[_len ] = 'z'; - core_info_list->all_ext[_len+1] = 'i'; - core_info_list->all_ext[_len+2] = 'p'; - core_info_list->all_ext[_len+3] = '|'; - core_info_list->all_ext[_len+4] = '\0'; + strlcat(core_info_list->all_ext, "zip|", all_ext_len); #endif }