blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

BLI_path_utils: rename BLI_clean -> BLI_path_native_slash

This commit is contained in:
Campbell Barton 2014-07-31 01:40:05 +10:00
parent fa8d38da74
commit 099038a6f9
3 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/blender.c
View File

@ -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);
}
}

4
source/blender/blenlib/BLI_path_util.h
View File

@ -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.

31
source/blender/blenlib/intern/path_util.c
View File

@ -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,
@ -2145,6 +2130,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.