[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55029] trunk/blender/source/blender: patch [#34103] use booleans for extensions testing.

Campbell Barton ideasman42 at gmail.com
Mon Mar 4 19:36:37 CET 2013


Revision: 55029
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55029
Author:   campbellbarton
Date:     2013-03-04 18:36:37 +0000 (Mon, 04 Mar 2013)
Log Message:
-----------
patch [#34103] use booleans for extensions testing.
bli_testextensie.patch - from Lawrence D'Oliveiro (ldo)

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/BLI_path_util.h
    trunk/blender/source/blender/blenlib/intern/path_util.c
    trunk/blender/source/blender/editors/mesh/mesh_data.c
    trunk/blender/source/blender/editors/space_buttons/buttons_ops.c
    trunk/blender/source/blender/editors/space_clip/clip_ops.c
    trunk/blender/source/blender/imbuf/intern/anim_movie.c
    trunk/blender/source/blender/imbuf/intern/readimage.c
    trunk/blender/source/blender/imbuf/intern/thumbs.c
    trunk/blender/source/blender/imbuf/intern/util.c
    trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c
    trunk/blender/source/blender/makesrna/intern/rna_main.c
    trunk/blender/source/blender/makesrna/intern/rna_main_api.c
    trunk/blender/source/blender/makesrna/intern/rna_render.c
    trunk/blender/source/blender/makesrna/intern/rna_scene_api.c
    trunk/blender/source/blender/makesrna/intern/rna_texture_api.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    trunk/blender/source/blender/python/intern/bpy.c
    trunk/blender/source/blender/python/intern/bpy_app.c
    trunk/blender/source/blender/python/intern/bpy_interface.c
    trunk/blender/source/blender/python/intern/bpy_traceback.c

Modified: trunk/blender/source/blender/blenlib/BLI_path_util.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_path_util.h	2013-03-04 18:30:48 UTC (rev 55028)
+++ trunk/blender/source/blender/blenlib/BLI_path_util.h	2013-03-04 18:36:37 UTC (rev 55029)
@@ -106,9 +106,9 @@
 char *BLI_first_slash(char *string);
 
 void BLI_getlastdir(const char *dir, char *last, const size_t maxlen);
-int BLI_testextensie(const char *str, const char *ext);
-int BLI_testextensie_array(const char *str, const char **ext_array);
-int BLI_testextensie_glob(const char *str, const char *ext_fnmatch);
+bool BLI_testextensie(const char *str, const char *ext);
+bool BLI_testextensie_array(const char *str, const char **ext_array);
+bool BLI_testextensie_glob(const char *str, const char *ext_fnmatch);
 int BLI_replace_extension(char *path, size_t maxlen, const char *ext);
 int BLI_ensure_extension(char *path, size_t maxlen, const char *ext);
 void BLI_uniquename(struct ListBase *list, void *vlink, const char defname[], char delim, short name_offs, short len);

Modified: trunk/blender/source/blender/blenlib/intern/path_util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/path_util.c	2013-03-04 18:30:48 UTC (rev 55028)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c	2013-03-04 18:36:37 UTC (rev 55029)
@@ -41,11 +41,11 @@
 
 #include "DNA_listBase.h"
 
+#include "BLI_utildefines.h"
 #include "BLI_fileops.h"
 #include "BLI_path_util.h"
 #include "BLI_string.h"
 #include "BLI_string_utf8.h"
-#include "BLI_utildefines.h"
 
 #include "../blenkernel/BKE_blender.h"  /* BLENDER_VERSION, bad level include (no function call) */
 
@@ -1359,43 +1359,31 @@
 	BLI_clean(string);
 }
 
-int BLI_testextensie(const char *str, const char *ext)
+/* does str end with ext. */
+bool BLI_testextensie(const char *str, const char *ext)
 {
-	short a, b;
-	int retval;
-	
-	a = strlen(str);
-	b = strlen(ext);
-	
-	if (a == 0 || b == 0 || b >= a) {
-		retval = 0;
-	}
-	else if (BLI_strcasecmp(ext, str + a - b)) {
-		retval = 0;
-	}
-	else {
-		retval = 1;
-	}
-	
-	return (retval);
+	const size_t a = strlen(str);
+	const size_t b = strlen(ext);
+	return !(a == 0 || b == 0 || b >= a) && (BLI_strcasecmp(ext, str + a - b) == 0);
 }
 
-int BLI_testextensie_array(const char *str, const char **ext_array)
+/* does str end with any of the suffixes in *ext_array. */
+bool BLI_testextensie_array(const char *str, const char **ext_array)
 {
 	int i = 0;
 	while (ext_array[i]) {
 		if (BLI_testextensie(str, ext_array[i])) {
-			return 1;
+			return true;
 		}
 
 		i++;
 	}
-	return 0;
+	return false;
 }
 
 /* semicolon separated wildcards, eg:
  *  '*.zip;*.py;*.exe' */
-int BLI_testextensie_glob(const char *str, const char *ext_fnmatch)
+bool BLI_testextensie_glob(const char *str, const char *ext_fnmatch)
 {
 	const char *ext_step = ext_fnmatch;
 	char pattern[16];
@@ -1414,12 +1402,12 @@
 		BLI_strncpy(pattern, ext_step, len_ext);
 
 		if (fnmatch(pattern, str, FNM_CASEFOLD) == 0) {
-			return 1;
+			return true;
 		}
 		ext_step += len_ext;
 	}
 
-	return 0;
+	return false;
 }
 
 

Modified: trunk/blender/source/blender/editors/mesh/mesh_data.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_data.c	2013-03-04 18:30:48 UTC (rev 55028)
+++ trunk/blender/source/blender/editors/mesh/mesh_data.c	2013-03-04 18:36:37 UTC (rev 55029)
@@ -36,6 +36,7 @@
 #include "DNA_scene_types.h"
 #include "DNA_view3d_types.h"
 
+#include "BLI_utildefines.h"
 #include "BLI_path_util.h"
 #include "BLI_array.h"
 #include "BLI_math.h"

Modified: trunk/blender/source/blender/editors/space_buttons/buttons_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/buttons_ops.c	2013-03-04 18:30:48 UTC (rev 55028)
+++ trunk/blender/source/blender/editors/space_buttons/buttons_ops.c	2013-03-04 18:36:37 UTC (rev 55029)
@@ -35,10 +35,10 @@
 
 #include "DNA_userdef_types.h"
 
+#include "BLI_utildefines.h"
 #include "BLI_fileops.h"
 #include "BLI_path_util.h"
 #include "BLI_string.h"
-#include "BLI_utildefines.h"
 
 #include "BLF_translation.h"
 

Modified: trunk/blender/source/blender/editors/space_clip/clip_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_ops.c	2013-03-04 18:30:48 UTC (rev 55028)
+++ trunk/blender/source/blender/editors/space_clip/clip_ops.c	2013-03-04 18:36:37 UTC (rev 55029)
@@ -36,8 +36,8 @@
 #include "DNA_userdef_types.h"
 #include "DNA_scene_types.h"	/* min/max frames */
 
+#include "BLI_utildefines.h"
 #include "BLI_path_util.h"
-#include "BLI_utildefines.h"
 #include "BLI_math.h"
 #include "BLI_rect.h"
 

Modified: trunk/blender/source/blender/imbuf/intern/anim_movie.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/anim_movie.c	2013-03-04 18:30:48 UTC (rev 55028)
+++ trunk/blender/source/blender/imbuf/intern/anim_movie.c	2013-03-04 18:36:37 UTC (rev 55029)
@@ -64,9 +64,9 @@
 #include <io.h>
 #endif
 
+#include "BLI_utildefines.h"
 #include "BLI_string.h"
 #include "BLI_path_util.h"
-#include "BLI_utildefines.h"
 #include "BLI_math_base.h"
 
 #include "MEM_guardedalloc.h"

Modified: trunk/blender/source/blender/imbuf/intern/readimage.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/readimage.c	2013-03-04 18:30:48 UTC (rev 55028)
+++ trunk/blender/source/blender/imbuf/intern/readimage.c	2013-03-04 18:36:37 UTC (rev 55029)
@@ -43,12 +43,11 @@
 #endif
 
 #include <stdlib.h>
+#include "BLI_utildefines.h"
 #include "BLI_string.h"
 #include "BLI_path_util.h"
 #include "BLI_fileops.h"
 
-#include "BLI_utildefines.h"
-
 #include "imbuf.h"
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"

Modified: trunk/blender/source/blender/imbuf/intern/thumbs.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/thumbs.c	2013-03-04 18:30:48 UTC (rev 55028)
+++ trunk/blender/source/blender/imbuf/intern/thumbs.c	2013-03-04 18:36:37 UTC (rev 55029)
@@ -34,6 +34,7 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_utildefines.h"
 #include "BLI_string.h"
 #include "BLI_path_util.h"
 #include "BLI_fileops.h"

Modified: trunk/blender/source/blender/imbuf/intern/util.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/util.c	2013-03-04 18:30:48 UTC (rev 55028)
+++ trunk/blender/source/blender/imbuf/intern/util.c	2013-03-04 18:36:37 UTC (rev 55029)
@@ -41,9 +41,9 @@
 
 #include <stdlib.h>
 
+#include "BLI_utildefines.h"
 #include "BLI_path_util.h"
 #include "BLI_fileops.h"
-#include "BLI_utildefines.h"
 #include "BLI_string.h"
 
 #include "DNA_userdef_types.h"

Modified: trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c	2013-03-04 18:30:48 UTC (rev 55028)
+++ trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c	2013-03-04 18:36:37 UTC (rev 55029)
@@ -28,6 +28,7 @@
 
 #include "DNA_object_fluidsim.h"
 
+#include "BLI_utildefines.h"
 #include "BLI_path_util.h"
 
 #include "RNA_define.h"

Modified: trunk/blender/source/blender/makesrna/intern/rna_main.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_main.c	2013-03-04 18:30:48 UTC (rev 55028)
+++ trunk/blender/source/blender/makesrna/intern/rna_main.c	2013-03-04 18:36:37 UTC (rev 55029)
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "BLI_utildefines.h"
 #include "BLI_path_util.h"
 
 #include "RNA_define.h"

Modified: trunk/blender/source/blender/makesrna/intern/rna_main_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_main_api.c	2013-03-04 18:30:48 UTC (rev 55028)
+++ trunk/blender/source/blender/makesrna/intern/rna_main_api.c	2013-03-04 18:36:37 UTC (rev 55029)
@@ -36,8 +36,8 @@
 #include "DNA_ID.h"
 #include "DNA_modifier_types.h"
 
+#include "BLI_utildefines.h"
 #include "BLI_path_util.h"
-#include "BLI_utildefines.h"
 
 #include "RNA_define.h"
 #include "RNA_access.h"

Modified: trunk/blender/source/blender/makesrna/intern/rna_render.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_render.c	2013-03-04 18:30:48 UTC (rev 55028)
+++ trunk/blender/source/blender/makesrna/intern/rna_render.c	2013-03-04 18:36:37 UTC (rev 55029)
@@ -28,6 +28,7 @@
 
 #include "DNA_scene_types.h"
 
+#include "BLI_utildefines.h"
 #include "BLI_path_util.h"
 
 #include "RNA_define.h"

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene_api.c	2013-03-04 18:30:48 UTC (rev 55028)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene_api.c	2013-03-04 18:36:37 UTC (rev 55029)
@@ -32,6 +32,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include "BLI_utildefines.h"
 #include "BLI_path_util.h"
 
 #include "RNA_define.h"

Modified: trunk/blender/source/blender/makesrna/intern/rna_texture_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_texture_api.c	2013-03-04 18:30:48 UTC (rev 55028)
+++ trunk/blender/source/blender/makesrna/intern/rna_texture_api.c	2013-03-04 18:36:37 UTC (rev 55029)
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "BLI_utildefines.h"
 #include "BLI_path_util.h"
 
 #include "RNA_define.h"

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_outputFile.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_outputFile.c	2013-03-04 18:30:48 UTC (rev 55028)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_outputFile.c	2013-03-04 18:36:37 UTC (rev 55029)
@@ -31,6 +31,7 @@
 
 
 #include <string.h>
+#include "BLI_utildefines.h"
 #include "BLI_path_util.h"
 
 #include "node_composite_util.h"


@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list