From b1d758ae6b63f1b644c5cb721f131ad1795c2b49 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 29 Mar 2015 03:56:39 +1100 Subject: Cleanup: redundant struct declarations --- source/blender/blenlib/BLI_path_util.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source/blender/blenlib/BLI_path_util.h') diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h index d99df24aaf7..c35b01e7f55 100644 --- a/source/blender/blenlib/BLI_path_util.h +++ b/source/blender/blenlib/BLI_path_util.h @@ -38,7 +38,6 @@ extern "C" { #include "BLI_compiler_attrs.h" struct ListBase; -struct direntry; #ifdef WIN32 #define SEP '\\' -- cgit v1.2.3 From e00142bfa73ace6ba2e66923e3c36b08b72c57ed Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 6 May 2015 06:05:31 +1000 Subject: BLI_path: add PATH search utility functions --- source/blender/blenlib/BLI_path_util.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source/blender/blenlib/BLI_path_util.h') diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h index c35b01e7f55..0513625772d 100644 --- a/source/blender/blenlib/BLI_path_util.h +++ b/source/blender/blenlib/BLI_path_util.h @@ -78,6 +78,11 @@ void BLI_del_slash(char *string) ATTR_NONNULL(); const char *BLI_first_slash(const char *string) ATTR_NONNULL() ATTR_WARN_UNUSED_RESULT; void BLI_path_native_slash(char *path) ATTR_NONNULL(); +#ifdef _WIN32 +bool BLI_path_binary_extensions_add_win32(char *name, const size_t maxlen); +#endif +bool BLI_path_binary_search(char *fullname, const size_t maxlen, const char *name); + void BLI_getlastdir(const char *dir, char *last, const size_t maxlen); bool BLI_testextensie(const char *str, const char *ext) ATTR_NONNULL() ATTR_WARN_UNUSED_RESULT; bool BLI_testextensie_n(const char *str, ...) ATTR_NONNULL(1) ATTR_SENTINEL(0); -- cgit v1.2.3 From c246e0c3b6bfd4c57d12f8c3b232968b59757e26 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 6 May 2015 06:34:19 +1000 Subject: Prefer name 'program' over 'binary' binary-search is confusing! --- source/blender/blenlib/BLI_path_util.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/blenlib/BLI_path_util.h') diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h index 0513625772d..30b57c5f41b 100644 --- a/source/blender/blenlib/BLI_path_util.h +++ b/source/blender/blenlib/BLI_path_util.h @@ -79,9 +79,9 @@ const char *BLI_first_slash(const char *string) ATTR_NONNULL() ATTR_WARN_UNUSED_ void BLI_path_native_slash(char *path) ATTR_NONNULL(); #ifdef _WIN32 -bool BLI_path_binary_extensions_add_win32(char *name, const size_t maxlen); +bool BLI_path_program_extensions_add_win32(char *name, const size_t maxlen); #endif -bool BLI_path_binary_search(char *fullname, const size_t maxlen, const char *name); +bool BLI_path_program_search(char *fullname, const size_t maxlen, const char *name); void BLI_getlastdir(const char *dir, char *last, const size_t maxlen); bool BLI_testextensie(const char *str, const char *ext) ATTR_NONNULL() ATTR_WARN_UNUSED_RESULT; -- cgit v1.2.3 From 2cbe60b47672acd67b6ec2c15f13f196247ecfe3 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Thu, 4 Jun 2015 20:40:11 +0200 Subject: New "use placeholders" feature of the sequencer did not detect correct filenames. Added BLI_path utility functions to decompose a path name and extract the frame number. It should be useful in autocollapse feature as well --- source/blender/blenlib/BLI_path_util.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/blender/blenlib/BLI_path_util.h') diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h index 30b57c5f41b..c9a54c33f21 100644 --- a/source/blender/blenlib/BLI_path_util.h +++ b/source/blender/blenlib/BLI_path_util.h @@ -132,6 +132,8 @@ bool BLI_parent_dir(char *path) ATTR_NONNULL(); bool BLI_path_abs(char *path, const char *basepath) ATTR_NONNULL(); bool BLI_path_frame(char *path, int frame, int digits) ATTR_NONNULL(); bool BLI_path_frame_range(char *path, int sta, int end, int digits) ATTR_NONNULL(); +bool BLI_path_frame_get(char *path, int *r_frame, int *numdigits) ATTR_NONNULL(); +void BLI_path_frame_strip(char *path, bool setsharp, char *ext) ATTR_NONNULL(); bool BLI_path_frame_check_chars(const char *path) ATTR_NONNULL(); bool BLI_path_cwd(char *path) ATTR_NONNULL(); void BLI_path_rel(char *file, const char *relfile) ATTR_NONNULL(); -- cgit v1.2.3