[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35335] trunk/blender: fix for invalid empty string check in uniquename callback.

Campbell Barton ideasman42 at gmail.com
Thu Mar 3 18:24:00 CET 2011


Revision: 35335
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35335
Author:   campbellbarton
Date:     2011-03-03 17:23:59 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
fix for invalid empty string check in uniquename callback.

Modified Paths:
--------------
    trunk/blender/build_files/cmake/macros.cmake
    trunk/blender/source/blender/blenlib/intern/path_util.c

Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake	2011-03-03 16:12:32 UTC (rev 35334)
+++ trunk/blender/build_files/cmake/macros.cmake	2011-03-03 17:23:59 UTC (rev 35335)
@@ -358,8 +358,8 @@
 		message(FATAL_ERROR "Version parsing failed for BLENDER_VERSION_CYCLE")
 	endif()
 
-	MATH(EXPR BLENDER_VERSION_MAJOR "${_out_version} / 100")
-	MATH(EXPR BLENDER_VERSION_MINOR "${_out_version} % 100")
+	math(EXPR BLENDER_VERSION_MAJOR "${_out_version} / 100")
+	math(EXPR BLENDER_VERSION_MINOR "${_out_version} % 100")
 	set(BLENDER_VERSION "${BLENDER_VERSION_MAJOR}.${BLENDER_VERSION_MINOR}")
 
 	set(BLENDER_SUBVERSION ${_out_subversion})
@@ -372,7 +372,7 @@
 	else()
 		set(_char_ls a b c d e f g h i j k l m n o p q r s t u v w q y z)
 		list(FIND _char_ls ${BLENDER_VERSION_CHAR} _out_version_char_index)
-		MATH(EXPR BLENDER_VERSION_CHAR_INDEX "${_out_version_char_index} + 1")
+		math(EXPR BLENDER_VERSION_CHAR_INDEX "${_out_version_char_index} + 1")
 		unset(_char_ls)
 		unset(_out_version_char_index)
 	endif()

Modified: trunk/blender/source/blender/blenlib/intern/path_util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/path_util.c	2011-03-03 16:12:32 UTC (rev 35334)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c	2011-03-03 17:23:59 UTC (rev 35335)
@@ -206,7 +206,7 @@
 
 int BLI_uniquename_cb(int (*unique_check)(void *, const char *), void *arg, const char defname[], char delim, char *name, short name_len)
 {
-	if(name == '\0') {
+	if(name[0] == '\0') {
 		BLI_strncpy(name, defname, name_len);
 	}
 
@@ -1192,7 +1192,7 @@
 
 void BLI_clean(char *path)
 {
-	if(path==0) return;
+	if(path==NULL) return;
 
 #ifdef WIN32
 	if(path && BLI_strnlen(path, 3) > 2) {
@@ -1205,7 +1205,7 @@
 
 void BLI_char_switch(char *string, char from, char to) 
 {
-	if(string==0) return;
+	if(string==NULL) return;
 	while (*string != 0) {
 		if (*string == from) *string = to;
 		string++;




More information about the Bf-blender-cvs mailing list