[Bf-blender-cvs] [57468ae37ef] master: Cleanup: missed renaming BLI_cleanup_unc_16 in recent refactor
Campbell Barton
noreply at git.blender.org
Wed Apr 8 08:47:19 CEST 2020
Commit: 57468ae37ef98c7380edfbd97acb3bf6d626e4a7
Author: Campbell Barton
Date: Wed Apr 8 16:29:46 2020 +1000
Branches: master
https://developer.blender.org/rB57468ae37ef98c7380edfbd97acb3bf6d626e4a7
Cleanup: missed renaming BLI_cleanup_unc_16 in recent refactor
Missed from d14e76806921f
===================================================================
M source/blender/blenlib/BLI_path_util.h
M source/blender/blenlib/intern/path_util.c
M source/blender/blenlib/intern/storage.c
===================================================================
diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h
index 2b88359861a..87f1ec5e4ff 100644
--- a/source/blender/blenlib/BLI_path_util.h
+++ b/source/blender/blenlib/BLI_path_util.h
@@ -109,7 +109,7 @@ bool BLI_path_is_unc(const char *path);
void BLI_path_to_display_name(char *display_name, int maxlen, const char *name) ATTR_NONNULL();
#if defined(WIN32)
-void BLI_cleanup_unc_16(wchar_t *path_16);
+void BLI_path_normalize_unc_16(wchar_t *path_16);
void BLI_path_normalize_unc(char *path_16, int maxlen);
#endif
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
index ad93b643c5e..95b2caa8836 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -497,11 +497,11 @@ static void BLI_path_unc_to_short(wchar_t *unc)
void BLI_path_normalize_unc(char *path, int maxlen)
{
wchar_t *tmp_16 = alloc_utf16_from_8(path, 1);
- BLI_cleanup_unc_16(tmp_16);
+ BLI_path_normalize_unc_16(tmp_16);
conv_utf_16_to_8(tmp_16, path, maxlen);
}
-void BLI_cleanup_unc_16(wchar_t *path_16)
+void BLI_path_normalize_unc_16(wchar_t *path_16)
{
BLI_path_unc_to_short(path_16);
BLI_path_add_slash_to_share(path_16);
diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c
index 7274a15661a..9b437b02c0a 100644
--- a/source/blender/blenlib/intern/storage.c
+++ b/source/blender/blenlib/intern/storage.c
@@ -316,7 +316,7 @@ int BLI_exists(const char *name)
* 2. after the C:\ when the path is the volume only
*/
if ((len >= 3) && (tmp_16[0] == L'\\') && (tmp_16[1] == L'\\')) {
- BLI_cleanup_unc_16(tmp_16);
+ BLI_path_normalize_unc_16(tmp_16);
}
if ((tmp_16[1] == L':') && (tmp_16[2] == L'\0')) {
More information about the Bf-blender-cvs
mailing list