From b1c9f9390345bca97ea4552ded17c81bc465b0a0 Mon Sep 17 00:00:00 2001 From: libretroadmin Date: Mon, 11 Jul 2022 21:29:01 +0200 Subject: [PATCH] (file_path) remove deprecated functions --- libretro-common/file/file_path.c | 64 ------------------------ libretro-common/include/file/file_path.h | 36 ------------- 2 files changed, 100 deletions(-) diff --git a/libretro-common/file/file_path.c b/libretro-common/file/file_path.c index b0bdd825a1..ec6106f1cc 100644 --- a/libretro-common/file/file_path.c +++ b/libretro-common/file/file_path.c @@ -1383,67 +1383,3 @@ bool is_path_accessible_using_standard_io(const char *path) return true; #endif } - -/* Deprecated functions */ -size_t fill_pathname_join_concat(char *out_path, - const char *dir, const char *path, - const char *concat, - size_t size) -{ - fill_pathname_join(out_path, dir, path, size); - return strlcat(out_path, concat, size); -} - -void fill_pathname_join_noext(char *out_path, - const char *dir, const char *path, size_t size) -{ - fill_pathname_join(out_path, dir, path, size); - path_remove_extension(out_path); -} - -size_t fill_pathname_join_delim_concat(char *out_path, const char *dir, - const char *path, const char delim, const char *concat, - size_t size) -{ - fill_pathname_join_delim(out_path, dir, path, delim, size); - return strlcat(out_path, concat, size); -} - -void fill_short_pathname_representation_noext(char* out_rep, - const char *in_path, size_t size) -{ - fill_short_pathname_representation(out_rep, in_path, size); - path_remove_extension(out_rep); -} - -/** - * fill_pathname_noext: - * @out_path : output path - * @in_path : input path - * @replace : what to replace - * @size : buffer size of output path - * - * Appends a filename extension 'replace' to 'in_path', and outputs - * result in 'out_path'. - * - * Assumes in_path has no extension. If an extension is still - * present in 'in_path', it will be ignored. - * - */ -size_t fill_pathname_noext(char *out_path, const char *in_path, - const char *replace, size_t size) -{ - strlcpy(out_path, in_path, size); - return strlcat(out_path, replace, size); -} - -void fill_pathname_base_noext(char *out, - const char *in_path, size_t size) -{ - const char *ptr = path_basename(in_path); - if (ptr) - strlcpy(out, ptr, size); - else - strlcpy(out, in_path, size); - path_remove_extension(out); -} diff --git a/libretro-common/include/file/file_path.h b/libretro-common/include/file/file_path.h index a535390bc2..16404fe0e9 100644 --- a/libretro-common/include/file/file_path.h +++ b/libretro-common/include/file/file_path.h @@ -520,42 +520,6 @@ int32_t path_get_size(const char *path); bool is_path_accessible_using_standard_io(const char *path); -/* Deprecated functions */ -size_t fill_pathname_join_concat(char *out_path, - const char *dir, const char *path, - const char *concat, - size_t size); - -void fill_pathname_join_noext(char *out_path, - const char *dir, const char *path, size_t size); - -void fill_short_pathname_representation_noext(char* out_rep, - const char *in_path, size_t size); - -size_t fill_pathname_join_delim_concat(char *out_path, const char *dir, - const char *path, const char delim, const char *concat, - size_t size); - -/** - * fill_pathname_noext: - * @out_path : output path - * @in_path : input path - * @replace : what to replace - * @size : buffer size of output path - * - * Appends a filename extension 'replace' to 'in_path', and outputs - * result in 'out_path'. - * - * Assumes in_path has no extension. If an extension is still - * present in 'in_path', it will be ignored. - * - */ -size_t fill_pathname_noext(char *out_path, const char *in_path, - const char *replace, size_t size); - -void fill_pathname_base_noext(char *out_dir, - const char *in_path, size_t size); - RETRO_END_DECLS #endif