[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44725] trunk/blender/source: use BLI_path_cmp() rather then strcmp()

Campbell Barton ideasman42 at gmail.com
Thu Mar 8 03:19:47 CET 2012


Revision: 44725
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44725
Author:   campbellbarton
Date:     2012-03-08 02:19:41 +0000 (Thu, 08 Mar 2012)
Log Message:
-----------
use BLI_path_cmp() rather then strcmp()

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
    trunk/blender/source/blender/blenkernel/intern/image.c
    trunk/blender/source/blender/python/intern/bpy_traceback.c
    trunk/blender/source/tests/bl_run_operators.py

Modified: trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c	2012-03-08 01:49:25 UTC (rev 44724)
+++ trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c	2012-03-08 02:19:41 UTC (rev 44725)
@@ -313,8 +313,8 @@
 	for(; surface; surface=surface->next) {
 		if (surface!=t_surface && surface->type==t_surface->type &&
 			surface->format==t_surface->format) {
-			if (surface->output_name[0]!='\0' && !strcmp(name, surface->output_name)) return 1;
-			if (surface->output_name2[0]!='\0' && !strcmp(name, surface->output_name2)) return 1;
+			if (surface->output_name[0]!='\0' && !BLI_path_cmp(name, surface->output_name)) return 1;
+			if (surface->output_name2[0]!='\0' && !BLI_path_cmp(name, surface->output_name2)) return 1;
 		}
 	}
 	return 0;

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2012-03-08 01:49:25 UTC (rev 44724)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2012-03-08 02:19:41 UTC (rev 44725)
@@ -531,13 +531,13 @@
 			BLI_strncpy(strtest, ima->name, sizeof(ima->name));
 			BLI_path_abs(strtest, G.main->name);
 			
-			if( strcmp(strtest, str)==0 ) {
+			if (BLI_path_cmp(strtest, str)==0) {
 				if(ima->anim==NULL || ima->id.us==0) {
 					BLI_strncpy(ima->name, name, sizeof(ima->name));	/* for stringcode */
 					ima->id.us++;										/* officially should not, it doesn't link here! */
 					if(ima->ok==0)
 						ima->ok= IMA_OK;
-			/* RETURN! */
+					/* RETURN! */
 					return ima;
 				}
 			}

Modified: trunk/blender/source/blender/python/intern/bpy_traceback.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_traceback.c	2012-03-08 01:49:25 UTC (rev 44724)
+++ trunk/blender/source/blender/python/intern/bpy_traceback.c	2012-03-08 02:19:41 UTC (rev 44725)
@@ -29,6 +29,8 @@
 #include <Python.h>
 #include <frameobject.h>
 
+#include "BLI_path_util.h"
+
 #include "bpy_traceback.h"
 
 static const char *traceback_filepath(PyTracebackObject *tb, PyObject **coerce)
@@ -127,8 +129,8 @@
 
 			if (parse_syntax_error(value, &message, &filename, lineno, offset, &text)) {
 				/* python adds a '/', prefix, so check for both */
-				if ((strcmp(filename, filepath) == 0) ||
-					((filename[0] == '\\' || filename[0] == '/') && strcmp(filename + 1, filepath) == 0)
+				if ((BLI_path_cmp(filename, filepath) == 0) ||
+					((filename[0] == '\\' || filename[0] == '/') && BLI_path_cmp(filename + 1, filepath) == 0)
 				) {
 					/* good */
 				}
@@ -152,7 +154,7 @@
 		{
 			PyObject *coerce;
 			const char *tb_filepath = traceback_filepath(tb, &coerce);
-			const int match = strcmp(tb_filepath, filepath) != 0;
+			const int match = BLI_path_cmp(tb_filepath, filepath) != 0;
 			Py_DECREF(coerce);
 
 			if (match) {

Modified: trunk/blender/source/tests/bl_run_operators.py
===================================================================
--- trunk/blender/source/tests/bl_run_operators.py	2012-03-08 01:49:25 UTC (rev 44724)
+++ trunk/blender/source/tests/bl_run_operators.py	2012-03-08 02:19:41 UTC (rev 44725)
@@ -42,6 +42,9 @@
     "wm.doc_view",
     "wm.path_open",
     "help.operator_cheat_sheet",
+    "wm.keyconfig_test",     # just annoying - but harmless
+    "wm.memory_statistics",  # another annoying one
+    # "mesh.vertex_color_remove",  #crashes! fixme
     )
 
 




More information about the Bf-blender-cvs mailing list