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.
This commit is contained in:
parent
0b16b63d87
commit
b839a5d076
|
@ -807,13 +807,13 @@ bool BKE_bpath_relocate_visitor(void *pathbase_v, char *path_dst, const char *pa
|
|||
}
|
||||
|
||||
/* Make referenced file absolute. This would be a side-effect of
|
||||
* BLI_cleanup_file, but we do it explicitly so we know if it changed. */
|
||||
* BLI_cleanup_path, but we do it explicitly so we know if it changed. */
|
||||
BLI_strncpy(filepath, path_src, FILE_MAX);
|
||||
if (BLI_path_abs(filepath, base_old)) {
|
||||
/* Path was relative and is now absolute. Remap.
|
||||
* Important BLI_cleanup_dir runs before the path is made relative
|
||||
* because it wont work for paths that start with "//../" */
|
||||
BLI_cleanup_file(base_new, filepath);
|
||||
BLI_cleanup_path(base_new, filepath);
|
||||
BLI_path_rel(filepath, base_new);
|
||||
BLI_strncpy(path_dst, filepath, FILE_MAX);
|
||||
return true;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -269,15 +269,6 @@ void BLI_cleanup_dir(const char *relabase, char *dir)
|
|||
BLI_add_slash(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.
|
||||
*
|
||||
|
|
|
@ -347,7 +347,7 @@ int Controller::LoadMesh(Render *re, ViewLayer *view_layer, Depsgraph *depsgraph
|
|||
soc string basename((const char *)qfi.fileName().toAscii().data());
|
||||
char cleaned[FILE_MAX];
|
||||
BLI_strncpy(cleaned, iFileName, FILE_MAX);
|
||||
BLI_cleanup_file(NULL, cleaned);
|
||||
BLI_cleanup_path(NULL, cleaned);
|
||||
string basename = string(cleaned);
|
||||
#endif
|
||||
|
||||
|
|
|
@ -46,7 +46,7 @@ void getPathName(const string &path, const string &base, vector<string> &pathnam
|
|||
dir = path.substr(pos, sep - pos);
|
||||
|
||||
BLI_strncpy(cleaned, dir.c_str(), FILE_MAX);
|
||||
BLI_cleanup_file(NULL, cleaned);
|
||||
BLI_cleanup_path(NULL, cleaned);
|
||||
res = string(cleaned);
|
||||
|
||||
if (!base.empty()) {
|
||||
|
|
Loading…
Reference in New Issue