Page MenuHome
Files F22195

path_util_bli_clean.patch
Public
Actions

path_util_bli_clean.patch
View Options

commit 3a16319c93b6286f5192a6295b3d761d1c6ecb1b
Author: Lawrence D'Oliveiro <ldo@geek-central.gen.nz>
Date: Mon Feb 18 06:25:52 2013 +0000
Rename BLI_clean to BLI_clean_sep
Get rid of unneeded forward declarations
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index 2a4562a..eaa48cd 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -174,7 +174,7 @@ static void clear_global(void)
static int clean_paths_visit_cb(void *UNUSED(userdata), char *path_dst, const char *path_src)
{
strcpy(path_dst, path_src);
- BLI_clean(path_dst);
+ BLI_clean_sep(path_dst);
return (strcmp(path_dst, path_src) == 0) ? FALSE : TRUE;
}
@@ -186,7 +186,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_clean_sep(scene->r.pic);
}
}
diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h
index 0a6b7df..7d9a998 100644
--- a/source/blender/blenlib/BLI_path_util.h
+++ b/source/blender/blenlib/BLI_path_util.h
@@ -120,7 +120,7 @@ int BLI_split_name_num(char *left, int *nr, const char *name, char delim);
void BLI_splitdirstring(char *di, char *fi);
/* make sure path separators conform to system one */
-void BLI_clean(char *path)
+void BLI_clean_sep(char *path)
#ifdef __GNUC__
__attribute__((nonnull(1)))
#endif
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
index 81e01fc..9014571 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -83,9 +83,6 @@ static char bprogname[FILE_MAX]; /* full path to program executable */
static char bprogdir[FILE_MAX]; /* full path to directory in which executable is located */
static char btempdir[FILE_MAX]; /* temporary directory */
-static int add_win32_extension(char *name);
-static char *blender_version_decimal(const int ver);
-
/* implementation */
int BLI_stringdec
@@ -571,7 +568,7 @@ it has more than one other path separator in it. */
{
int len;
int slashes = 0;
- BLI_clean(path);
+ BLI_clean_sep(path);
len = BLI_add_slash(path) - 1;
while (len >= 0) {
@@ -1319,7 +1316,7 @@ void BLI_setenv_if_new(const char *env, const char *val)
}
-void BLI_clean(char *path)
+void BLI_clean_sep(char *path)
/* changes to the path separators to the native ones for this OS. */
{
#ifdef WIN32
@@ -1474,7 +1471,7 @@ void BLI_make_file_string
strcat(string, file);
/* Push all slashes to the system preferred direction */
- BLI_clean(string);
+ BLI_clean_sep(string);
}
bool BLI_testextensie(const char *str, const char *ext)

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
38/ce/d16d60c9c268d1b523448c558508

Event Timeline