CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-03-03 00:55:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-06-30 05:04:27 +02:00
parent 543c188da6
commit 83bafe1b19
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libretro-common/file/file_path.c
View File

@ -585,6 +585,15 @@ void fill_pathname_join(char *out_path,
retro_assert(strlcat(out_path, path, size) < size); retro_assert(strlcat(out_path, path, size) < size);
} }
static void fill_string_join(char *out_path,
const char *append, size_t size)
{
if (*out_path)
fill_pathname_slash(out_path, size);
retro_assert(strlcat(out_path, append, size) < size);
}
void fill_pathname_join_special_ext(char *out_path, void fill_pathname_join_special_ext(char *out_path,
const char *dir, const char *path, const char *dir, const char *path,
const char *last, const char *ext, const char *last, const char *ext,
@ -611,14 +620,6 @@ void fill_pathname_join_noext(char *out_path,
path_remove_extension(out_path); path_remove_extension(out_path);
} }
void fill_string_join(char *out_path,
const char *append, size_t size)
{
if (*out_path)
fill_pathname_slash(out_path, size);
retro_assert(strlcat(out_path, append, size) < size);
}
/** /**
* fill_pathname_join_delim: * fill_pathname_join_delim:

13
libretro-common/include/file/file_path.h
View File

@ -323,19 +323,6 @@ void fill_pathname_join_concat(char *out_path,
void fill_pathname_join_noext(char *out_path, void fill_pathname_join_noext(char *out_path,
const char *dir, const char *path, size_t size); const char *dir, const char *path, size_t size);
/**
* fill_string_join:
* @out_path : output path
* @path : path
* @size : size of output path
*
* Joins a string (@out_path) and path (@append) together.
* Makes sure not to get two consecutive slashes
* between directory and path.
**/
void fill_string_join(char *out_path,
const char *path, size_t size);
/** /**
* fill_pathname_join_delim: * fill_pathname_join_delim:
* @out_path : output path * @out_path : output path