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:
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r--source/blender/blenlib/BLI_fileops.h1
-rw-r--r--source/blender/blenlib/intern/fileops.c25
-rw-r--r--source/blender/blenlib/intern/path_util.c2
3 files changed, 1 insertions, 27 deletions
diff --git a/source/blender/blenlib/BLI_fileops.h b/source/blender/blenlib/BLI_fileops.h
index e6ea3559e8c..6c98d30e4b1 100644
--- a/source/blender/blenlib/BLI_fileops.h
+++ b/source/blender/blenlib/BLI_fileops.h
@@ -54,7 +54,6 @@ char *BLI_last_slash(const char *string);
int BLI_add_slash(char *string);
void BLI_del_slash(char *string);
char *first_slash(char *string);
-const char *BLI_short_filename(const char *string);
/* only for the sane unix world: direct calls to system functions :( */
#ifndef WIN32
diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c
index 73434c548a0..a543f4623f1 100644
--- a/source/blender/blenlib/intern/fileops.c
+++ b/source/blender/blenlib/intern/fileops.c
@@ -80,31 +80,6 @@ char *BLI_last_slash(const char *string) {
else return lfslash;
}
-static const char *last_slash_len(const char *string, int len) {
- int a;
-
- for(a=len-1; a>=0; a--)
- if(string[a] == '/' || string[a] == '\\')
- return &string[a];
-
- return NULL;
-}
-
-const char *BLI_short_filename(const char *string) {
- const char *ls, *lls;
-
- ls= last_slash_len(string, strlen(string));
- if(!ls)
- return string;
-
- lls= last_slash_len(string, ls-string);
-
- if(lls)
- return lls+1;
- else
- return ls+1;
-}
-
/* adds a slash if there isnt one there alredy */
int BLI_add_slash(char *string) {
int len = strlen(string);
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
index f91c38b8271..2cea9c21a57 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -1175,7 +1175,7 @@ void BLI_join_dirfile(char *string, const char *dir, const char *file)
/* like pythons os.path.basename( ) */
char *BLI_path_basename(char *path)
{
- const char *filename= BLI_last_slash(path);
+ char *filename= BLI_last_slash(path);
return filename ? filename + 1 : path;
}