[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32798] trunk/blender/source/blender: initialize structs to zero rather then using memset().

Campbell Barton ideasman42 at gmail.com
Sun Oct 31 16:39:37 CET 2010


Revision: 32798
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32798
Author:   campbellbarton
Date:     2010-10-31 16:39:37 +0100 (Sun, 31 Oct 2010)

Log Message:
-----------
initialize structs to zero rather then using memset().

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/action.c
    trunk/blender/source/blender/blenkernel/intern/brush.c
    trunk/blender/source/blender/blenkernel/intern/constraint.c
    trunk/blender/source/blender/blenkernel/intern/context.c
    trunk/blender/source/blender/blenkernel/intern/multires.c
    trunk/blender/source/blender/blenkernel/intern/seqeffects.c
    trunk/blender/source/blender/blenkernel/intern/sequencer.c
    trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
    trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/editors/animation/anim_draw.c
    trunk/blender/source/blender/editors/animation/drivers.c
    trunk/blender/source/blender/editors/animation/keyframing.c
    trunk/blender/source/blender/editors/animation/keyingsets.c
    trunk/blender/source/blender/editors/armature/poselib.c
    trunk/blender/source/blender/editors/armature/poseobject.c
    trunk/blender/source/blender/editors/object/object_bake.c
    trunk/blender/source/blender/editors/space_action/action_edit.c
    trunk/blender/source/blender/editors/space_action/action_select.c
    trunk/blender/source/blender/editors/space_graph/graph_select.c
    trunk/blender/source/blender/editors/space_info/info_stats.c
    trunk/blender/source/blender/editors/space_nla/nla_edit.c
    trunk/blender/source/blender/editors/space_node/node_draw.c
    trunk/blender/source/blender/editors/space_time/space_time.c
    trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
    trunk/blender/source/blender/editors/space_view3d/view3d_view.c
    trunk/blender/source/blender/editors/transform/transform.c
    trunk/blender/source/blender/editors/transform/transform_generics.c
    trunk/blender/source/blender/gpu/intern/gpu_material.c
    trunk/blender/source/blender/makesrna/intern/rna_access.c
    trunk/blender/source/blender/render/intern/source/volume_precache.c
    trunk/blender/source/blender/windowmanager/intern/wm_cursors.c

Modified: trunk/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/action.c	2010-10-31 14:44:45 UTC (rev 32797)
+++ trunk/blender/source/blender/blenkernel/intern/action.c	2010-10-31 15:39:37 UTC (rev 32798)
@@ -1134,10 +1134,9 @@
 		animsys_evaluate_action_group(&id_ptr, act, agrp, NULL, cframe);
 	}
 	else {
-		AnimData adt;
+		AnimData adt= {0};
 		
 		/* init animdata, and attach to workob */
-		memset(&adt, 0, sizeof(AnimData));
 		workob->adt= &adt;
 		
 		adt.recalc= ADT_RECALC_ANIM;

Modified: trunk/blender/source/blender/blenkernel/intern/brush.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/brush.c	2010-10-31 14:44:45 UTC (rev 32797)
+++ trunk/blender/source/blender/blenkernel/intern/brush.c	2010-10-31 15:39:37 UTC (rev 32798)
@@ -228,10 +228,8 @@
 
 void brush_debug_print_state(Brush *br)
 {
-	Brush def;
-
 	/* create a fake brush and set it to the defaults */
-	memset(&def, 0, sizeof(Brush));
+	Brush def= {{0}};
 	brush_set_defaults(&def);
 	
 #define BR_TEST(field, t)					\
@@ -1098,11 +1096,9 @@
 {
 	unsigned int *texcache = NULL;
 	MTex *mtex = &br->mtex;
-	TexResult texres;
+	TexResult texres= {0};
 	int hasrgb, ix, iy;
 	int side = half_side * 2;
-
-	memset(&texres, 0, sizeof(TexResult));
 	
 	if(mtex->tex) {
 		float x, y, step = 2.0 / side, co[3];

Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c	2010-10-31 14:44:45 UTC (rev 32797)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c	2010-10-31 15:39:37 UTC (rev 32798)
@@ -3427,8 +3427,7 @@
 		BVHTreeRayHit hit;
 		BVHTreeNearest nearest;
 		
-		BVHTreeFromMesh treeData;
-		memset(&treeData, 0, sizeof(treeData));
+		BVHTreeFromMesh treeData= {0};
 		
 		nearest.index = -1;
 		nearest.dist = FLT_MAX;

Modified: trunk/blender/source/blender/blenkernel/intern/context.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/context.c	2010-10-31 14:44:45 UTC (rev 32797)
+++ trunk/blender/source/blender/blenkernel/intern/context.c	2010-10-31 15:39:37 UTC (rev 32798)
@@ -554,8 +554,7 @@
 		return result.list;
 	}
 	else {
-		ListBase list;
-		memset(&list, 0, sizeof(list));
+		ListBase list= {NULL, NULL};
 		return list;
 	}
 }

Modified: trunk/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/multires.c	2010-10-31 14:44:45 UTC (rev 32797)
+++ trunk/blender/source/blender/blenkernel/intern/multires.c	2010-10-31 15:39:37 UTC (rev 32798)
@@ -492,9 +492,8 @@
 
 static DerivedMesh *multires_dm_create_local(Object *ob, DerivedMesh *dm, int lvl, int totlvl, int simple)
 {
-	MultiresModifierData mmd;
+	MultiresModifierData mmd= {{0}};
 
-	memset(&mmd, 0, sizeof(MultiresModifierData));
 	mmd.lvl = lvl;
 	mmd.sculptlvl = lvl;
 	mmd.renderlvl = lvl;
@@ -506,9 +505,8 @@
 
 static DerivedMesh *subsurf_dm_create_local(Object *UNUSED(ob), DerivedMesh *dm, int lvl, int simple, int optimal)
 {
-	SubsurfModifierData smd;
+	SubsurfModifierData smd= {{0}};
 
-	memset(&smd, 0, sizeof(SubsurfModifierData));
 	smd.levels = smd.renderLevels = lvl;
 	smd.flags |= eSubsurfModifierFlag_SubsurfUv;
 	if(simple)

Modified: trunk/blender/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqeffects.c	2010-10-31 14:44:45 UTC (rev 32797)
+++ trunk/blender/source/blender/blenkernel/intern/seqeffects.c	2010-10-31 15:39:37 UTC (rev 32798)
@@ -3260,10 +3260,8 @@
 
 struct SeqEffectHandle get_sequence_effect(Sequence * seq)
 {
-	struct SeqEffectHandle rval;
+	struct SeqEffectHandle rval= {0};
 
-	memset(&rval, 0, sizeof(struct SeqEffectHandle));
-
 	if (seq->type & SEQ_EFFECT) {
 		rval = get_sequence_effect_impl(seq->type);
 		if ((seq->flag & SEQ_EFFECT_NOT_LOADED) != 0) {
@@ -3277,10 +3275,8 @@
 
 struct SeqEffectHandle get_sequence_blend(Sequence * seq)
 {
-	struct SeqEffectHandle rval;
+	struct SeqEffectHandle rval= {0};
 
-	memset(&rval, 0, sizeof(struct SeqEffectHandle));
-
 	if (seq->blend_mode != 0) {
 		rval = get_sequence_effect_impl(seq->blend_mode);
 		if ((seq->flag & SEQ_EFFECT_NOT_LOADED) != 0) {

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2010-10-31 14:44:45 UTC (rev 32797)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2010-10-31 15:39:37 UTC (rev 32798)
@@ -1474,13 +1474,10 @@
 	}
 
 	if(seq->flag & (SEQ_USE_CROP|SEQ_USE_TRANSFORM)) {
-		StripCrop c;
-		StripTransform t;
+		StripCrop c= {0};
+		StripTransform t= {0};
 		int sx,sy,dx,dy;
 
-		memset(&c, 0, sizeof(StripCrop));
-		memset(&t, 0, sizeof(StripTransform));
-
 		if(seq->flag & SEQ_USE_CROP && seq->strip->crop) {
 			c = *seq->strip->crop;
 		}

Modified: trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c	2010-10-31 14:44:45 UTC (rev 32797)
+++ trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c	2010-10-31 15:39:37 UTC (rev 32798)
@@ -559,8 +559,7 @@
 		//Using vertexs positions/normals as if a subsurface was applied 
 		if(smd->subsurfLevels)
 		{
-			SubsurfModifierData ssmd;
-			memset(&ssmd, 0, sizeof(ssmd));
+			SubsurfModifierData ssmd= {{0}};
 			ssmd.subdivType	= ME_CC_SUBSURF;		//catmull clark
 			ssmd.levels		= smd->subsurfLevels;	//levels
 

Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2010-10-31 14:44:45 UTC (rev 32797)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2010-10-31 15:39:37 UTC (rev 32798)
@@ -1357,7 +1357,7 @@
 	CCGSubSurf *ss = ccgdm->ss;
 	CCGFaceIterator *fi = ccgSubSurf_getFaceIterator(ss);
 	GPUVertexAttribs gattribs;
-	DMVertexAttribs attribs;
+	DMVertexAttribs attribs= {{{0}}};
 	MTFace *tf = dm->getFaceDataArray(dm, CD_MTFACE);
 	int gridSize = ccgSubSurf_getGridSize(ss);
 	int gridFaces = gridSize - 1;
@@ -1374,8 +1374,6 @@
 	transp = GPU_get_material_blend_mode();
 	orig_transp = transp;
 
-	memset(&attribs, 0, sizeof(attribs));
-
 #define PASSATTRIB(dx, dy, vert) {												\
 	if(attribs.totorco) {														\
 		index = getFaceIndex(ss, f, S, x+dx, y+dy, edgeSize, gridSize); 		\

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2010-10-31 14:44:45 UTC (rev 32797)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2010-10-31 15:39:37 UTC (rev 32798)
@@ -588,20 +588,16 @@
 
 static BHeadN *get_bhead(FileData *fd)
 {
-	BHead8 bhead8;
-	BHead4 bhead4;
-	BHead  bhead;
 	BHeadN *new_bhead = 0;
 	int readsize;
 	
 	if (fd) {
 		if ( ! fd->eof) {
-
-			/* not strictly needed but shuts valgrind up
+			/* initializing to zero isn't strictly needed but shuts valgrind up
 			 * since uninitialized memory gets compared */
-			memset(&bhead8, 0, sizeof(BHead8));
-			memset(&bhead4, 0, sizeof(BHead4));
-			memset(&bhead,  0, sizeof(BHead));
+			BHead8 bhead8= {0};
+			BHead4 bhead4= {0};
+			BHead  bhead= {0};
 			
 			// First read the bhead structure.
 			// Depending on the platform the file was written on this can

Modified: trunk/blender/source/blender/editors/animation/anim_draw.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_draw.c	2010-10-31 14:44:45 UTC (rev 32797)
+++ trunk/blender/source/blender/editors/animation/anim_draw.c	2010-10-31 15:39:37 UTC (rev 32798)
@@ -352,14 +352,13 @@
  */
 void ANIM_nla_mapping_apply_fcurve (AnimData *adt, FCurve *fcu, short restore, short only_keys)
 {
-	KeyframeEditData ked;
+	KeyframeEditData ked= {{0}};
 	KeyframeEditFunc map_cb;
 	
 	/* init edit data 
 	 *	- AnimData is stored in 'data'
 	 *	- only_keys is stored in 'i1'
 	 */
-	memset(&ked, 0, sizeof(KeyframeEditData));
 	ked.data= (void *)adt;
 	ked.i1= (int)only_keys;
 	

Modified: trunk/blender/source/blender/editors/animation/drivers.c
===================================================================
--- trunk/blender/source/blender/editors/animation/drivers.c	2010-10-31 14:44:45 UTC (rev 32797)
+++ trunk/blender/source/blender/editors/animation/drivers.c	2010-10-31 15:39:37 UTC (rev 32798)
@@ -364,14 +364,13 @@
 
 static int add_driver_button_exec (bContext *C, wmOperator *op)
 {
-	PointerRNA ptr;
+	PointerRNA ptr= {{0}};
 	PropertyRNA *prop= NULL;
 	char *path;
 	short success= 0;
 	int index, all= RNA_boolean_get(op->ptr, "all");
 	
 	/* try to create driver using property retrieved from UI */
-	memset(&ptr, 0, sizeof(PointerRNA));
 	uiContextActiveProperty(C, &ptr, &prop, &index);
 
 	if (all)
@@ -421,14 +420,13 @@
 
 static int remove_driver_button_exec (bContext *C, wmOperator *op)
 {
-	PointerRNA ptr;
+	PointerRNA ptr= {{0}};
 	PropertyRNA *prop= NULL;
 	char *path;
 	short success= 0;
 	int index, all= RNA_boolean_get(op->ptr, "all");
 	
 	/* try to find driver using property retrieved from UI */
-	memset(&ptr, 0, sizeof(PointerRNA));
 	uiContextActiveProperty(C, &ptr, &prop, &index);
 	
 	if (all)
@@ -474,14 +472,13 @@
 
 static int copy_driver_button_exec (bContext *C, wmOperator *UNUSED(op))
 {
-	PointerRNA ptr;
+	PointerRNA ptr= {{0}};
 	PropertyRNA *prop= NULL;
 	char *path;
 	short success= 0;
 	int index;
 	
 	/* try to create driver using property retrieved from UI */
-	memset(&ptr, 0, sizeof(PointerRNA));
 	uiContextActiveProperty(C, &ptr, &prop, &index);
 	
 	if (ptr.id.data && ptr.data && prop && RNA_property_animateable(&ptr, prop)) {
@@ -520,14 +517,13 @@
 
 static int paste_driver_button_exec (bContext *C, wmOperator *UNUSED(op))
 {
-	PointerRNA ptr;
+	PointerRNA ptr= {{0}};
 	PropertyRNA *prop= NULL;
 	char *path;
 	short success= 0;
 	int index;
 	
 	/* try to create driver using property retrieved from UI */

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list