Use path_get_extension_mutable

This commit is contained in:
LibretroAdmin 2025-01-16 21:09:19 +01:00
parent 7e00668181
commit 86c9a43b08
3 changed files with 6 additions and 5 deletions

View File

@ -255,7 +255,8 @@ const char *path_get_extension(const char *path)
char *path_get_extension_mutable(const char *path) char *path_get_extension_mutable(const char *path)
{ {
char *ext = NULL; char *ext = NULL;
if (!string_is_empty(path) && ((ext = (char*)strrchr(path_basename(path), '.')))) if ( !string_is_empty(path)
&& ((ext = (char*)strrchr(path_basename(path), '.'))))
return ext; return ext;
return NULL; return NULL;
} }
@ -276,8 +277,7 @@ char *path_get_extension_mutable(const char *path)
**/ **/
char *path_remove_extension(char *s) char *path_remove_extension(char *s)
{ {
char *last = !string_is_empty(s) char *last = path_get_extension_mutable(s);
? (char*)strrchr(path_basename(s), '.') : NULL;
if (!last) if (!last)
return NULL; return NULL;
if (*last) if (*last)

View File

@ -5145,7 +5145,7 @@ static unsigned menu_displaylist_parse_content_information(
settings->paths.path_content_database, settings->paths.path_content_database,
db_name, db_name,
sizeof(db_path)); sizeof(db_path));
last = (char*)strrchr(path_basename(db_path), '.'); last = path_get_extension_mutable(db_path);
if (*last) if (*last)
{ {
last[0] = '.'; last[0] = '.';

View File

@ -7856,7 +7856,8 @@ void runloop_path_set_basename(const char *path)
*/ */
path_basedir_wrapper(runloop_st->runtime_content_path_basename); path_basedir_wrapper(runloop_st->runtime_content_path_basename);
if (!string_is_empty(runloop_st->runtime_content_path_basename)) if (!string_is_empty(runloop_st->runtime_content_path_basename))
fill_pathname_dir(runloop_st->runtime_content_path_basename, path, "", sizeof(runloop_st->runtime_content_path_basename)); fill_pathname_dir(runloop_st->runtime_content_path_basename, path,
"", sizeof(runloop_st->runtime_content_path_basename));
#endif #endif
if ((dst = strrchr(runloop_st->runtime_content_path_basename, '.'))) if ((dst = strrchr(runloop_st->runtime_content_path_basename, '.')))