Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-03-06 16:13:03 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-03-06 16:19:01 +0300
commitb839a5d0765bd449fb4f3a58ed683ec0233a8acf (patch)
tree786410ae468b9ecb2f8c3c37dc4b39f0167d7f5d /source/blender/blenlib
parent0b16b63d87e8a217cd73ec3220b4cb9af69ac355 (diff)
Cleanup: remove BLI_cleanup_file
In practice, references to files rarely have trailing slashes (by accident). Remove this function in favor of BLI_cleanup_path.
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r--source/blender/blenlib/BLI_path_util.h7
-rw-r--r--source/blender/blenlib/intern/path_util.c9
2 files changed, 2 insertions, 14 deletions
diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h
index ec911c11a8c..d4e3ebdb2e1 100644
--- a/source/blender/blenlib/BLI_path_util.h
+++ b/source/blender/blenlib/BLI_path_util.h
@@ -81,12 +81,9 @@ int BLI_stringdec(const char *string, char *head, char *start, unsigned short *n
void BLI_stringenc(
char *string, const char *head, const char *tail, unsigned short numlen, int pic);
-/* removes trailing slash */
-void BLI_cleanup_file(const char *relabase, char *path) ATTR_NONNULL(2);
-/* same as above but adds a trailing slash */
-void BLI_cleanup_dir(const char *relabase, char *dir) ATTR_NONNULL(2);
-/* doesn't touch trailing slash */
void BLI_cleanup_path(const char *relabase, char *path) ATTR_NONNULL(2);
+/* Same as above but adds a trailing slash. */
+void BLI_cleanup_dir(const char *relabase, char *dir) ATTR_NONNULL(2);
bool BLI_filename_make_safe(char *fname) ATTR_NONNULL(1);
bool BLI_path_make_safe(char *path) ATTR_NONNULL(1);
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
index e3c455fe417..48148fc1134 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -270,15 +270,6 @@ void BLI_cleanup_dir(const char *relabase, char *dir)
}
/**
- * Cleanup filepath ensuring no trailing slash.
- */
-void BLI_cleanup_file(const char *relabase, char *path)
-{
- BLI_cleanup_path(relabase, path);
- BLI_del_slash(path);
-}
-
-/**
* Make given name safe to be used in paths.
*
* \return true if \a fname was changed, false otherwise.