diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-07-30 19:40:05 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-07-30 19:40:47 +0400 |
commit | 099038a6f954bdd984117f2c4a1cafd786e152b9 (patch) | |
tree | e6dd82f4b80f207115e5ea3b506a9d728d17fd03 | |
parent | fa8d38da74946d3d08ecb4548db98eb2a855b096 (diff) |
BLI_path_utils: rename BLI_clean -> BLI_path_native_slash
-rw-r--r-- | source/blender/blenkernel/intern/blender.c | 4 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_path_util.h | 4 | ||||
-rw-r--r-- | source/blender/blenlib/intern/path_util.c | 31 |
3 files changed, 18 insertions, 21 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 01de5cc4545..fff8265a158 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -170,7 +170,7 @@ static void clear_global(void) static bool clean_paths_visit_cb(void *UNUSED(userdata), char *path_dst, const char *path_src) { strcpy(path_dst, path_src); - BLI_clean(path_dst); + BLI_path_native_slash(path_dst); return !STREQ(path_dst, path_src); } @@ -182,7 +182,7 @@ static void clean_paths(Main *main) BKE_bpath_traverse_main(main, clean_paths_visit_cb, BKE_BPATH_TRAVERSE_SKIP_MULTIFILE, NULL); for (scene = main->scene.first; scene; scene = scene->id.next) { - BLI_clean(scene->r.pic); + BLI_path_native_slash(scene->r.pic); } } diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h index 244c308a05c..3d82480d050 100644 --- a/source/blender/blenlib/BLI_path_util.h +++ b/source/blender/blenlib/BLI_path_util.h @@ -111,6 +111,7 @@ const char *BLI_last_slash(const char *string) ATTR_NONNULL() ATTR_WARN_UNUSED_R int BLI_add_slash(char *string) ATTR_NONNULL(); 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(); 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; @@ -128,9 +129,6 @@ 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); int BLI_split_name_num(char *left, int *nr, const char *name, const char delim); -/* make sure path separators conform to system one */ -void BLI_clean(char *path) ATTR_NONNULL(); - /** * dir can be any input, like from buttons, and this function * converts it to a regular full path. diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index 1a48212789f..bcc51fc15a2 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -1515,21 +1515,6 @@ void BLI_setenv_if_new(const char *env, const char *val) BLI_setenv(env, val); } - -/** - * Changes to the path separators to the native ones for this OS. - */ -void BLI_clean(char *path) -{ -#ifdef WIN32 - if (path && BLI_strnlen(path, 3) > 2) { - BLI_char_switch(path + 2, '/', '\\'); - } -#else - BLI_char_switch(path + BLI_path_unc_prefix_len(path), '\\', '/'); -#endif -} - /** * Change every \a from in \a string into \a to. The * result will be in \a string @@ -1681,7 +1666,7 @@ void BLI_make_file_string(const char *relabase, char *string, const char *dir, c strcat(string, file); /* Push all slashes to the system preferred direction */ - BLI_clean(string); + BLI_path_native_slash(string); } static bool testextensie_ex(const char *str, const size_t str_len, @@ -2146,6 +2131,20 @@ void BLI_del_slash(char *string) } /** + * Changes to the path separators to the native ones for this OS. + */ +void BLI_path_native_slash(char *path) +{ +#ifdef WIN32 + if (path && BLI_strnlen(path, 3) > 2) { + BLI_char_switch(path + 2, '/', '\\'); + } +#else + BLI_char_switch(path + BLI_path_unc_prefix_len(path), '\\', '/'); +#endif +} + +/** * Tries appending each of the semicolon-separated extensions in the PATHEXT * environment variable (Windows-only) onto *name in turn until such a file is found. * Returns success/failure. |