diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-11-23 11:44:21 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-23 11:44:21 +0300 |
commit | ce2295999e5fc667f3574b9c53cba04155bd1546 (patch) | |
tree | f54198fa757c4282a2f0f79c46d6fedbbf728480 /source/blender | |
parent | 225be0cf30940cf840bbac0f19b10efadecf94d4 (diff) |
use zero initializers instead of memset(), also change PointerRNA_NULL from an extern into a define.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/avi/intern/avi.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/anim.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 7 | ||||
-rw-r--r-- | source/blender/editors/animation/keyframing.c | 6 | ||||
-rw-r--r-- | source/blender/editors/object/object_relations.c | 4 | ||||
-rw-r--r-- | source/blender/editors/render/render_preview.c | 3 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_image.c | 4 | ||||
-rw-r--r-- | source/blender/imbuf/intern/iris.c | 3 | ||||
-rw-r--r-- | source/blender/makesrna/RNA_access.h | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_access.c | 21 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_rna.c | 3 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 4 |
12 files changed, 22 insertions, 45 deletions
diff --git a/source/blender/avi/intern/avi.c b/source/blender/avi/intern/avi.c index d4b39b176d8..a30f51da499 100644 --- a/source/blender/avi/intern/avi.c +++ b/source/blender/avi/intern/avi.c @@ -213,15 +213,13 @@ int AVI_is_avi (char *name) { int AVI_is_avi (const char *name) { int temp, fcca, j; - AviMovie movie; + AviMovie movie= {0}; AviMainHeader header; AviBitmapInfoHeader bheader; int movie_tracks = 0; DEBUG_PRINT("opening movie\n"); - memset(&movie, 0, sizeof(AviMovie)); - movie.type = AVI_MOVIE_READ; movie.fp = fopen (name, "rb"); movie.offset_table = NULL; diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index 6bbcecce2f7..b58bd8c7f3e 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -1441,7 +1441,7 @@ static Object *find_family_object(Object **obar, char *family, char ch) static void font_duplilist(ListBase *lb, Scene *scene, Object *par, int level, int animated) { - Object *ob, *obar[256]; + Object *ob, *obar[256]= {0}; Curve *cu; struct chartrans *ct, *chartransdata; float vec[3], obmat[4][4], pmat[4][4], fsize, xof, yof; @@ -1456,9 +1456,7 @@ static void font_duplilist(ListBase *lb, Scene *scene, Object *par, int level, i chartransdata= BKE_text_to_curve(scene, par, FO_DUPLI); if(chartransdata==0) return; - - memset(obar, 0, 256*sizeof(void *)); - + cu= par->data; slen= strlen(cu->str); fsize= cu->fsize; diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index deb4e51950c..580f94ba3b8 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -1610,9 +1610,6 @@ void nladata_flush_channels (ListBase *channels) */ static void animsys_evaluate_nla (PointerRNA *ptr, AnimData *adt, float ctime) { - ListBase dummy_trackslist = {NULL, NULL}; - NlaStrip dummy_strip; - NlaTrack *nlt; short track_index=0; short has_strips = 0; @@ -1655,7 +1652,9 @@ static void animsys_evaluate_nla (PointerRNA *ptr, AnimData *adt, float ctime) /* if there are strips, evaluate action as per NLA rules */ if ((has_strips) || (adt->actstrip)) { /* make dummy NLA strip, and add that to the stack */ - memset(&dummy_strip, 0, sizeof(NlaStrip)); + NlaStrip dummy_strip= {0}; + ListBase dummy_trackslist; + dummy_trackslist.first= dummy_trackslist.last= &dummy_strip; if ((nlt) && !(adt->flag & ADT_NLA_EDIT_NOMAP)) { diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index fd8487973c8..1216894e973 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -287,13 +287,12 @@ int insert_bezt_fcurve (FCurve *fcu, BezTriple *bezt, short flag) */ int insert_vert_fcurve (FCurve *fcu, float x, float y, short flag) { - BezTriple beztr; + BezTriple beztr= {{{0}}}; int a; /* set all three points, for nicer start position * NOTE: +/- 1 on vec.x for left and right handles is so that 'free' handles work ok... */ - memset(&beztr, 0, sizeof(BezTriple)); beztr.vec[0][0]= x-1.0f; beztr.vec[0][1]= y; beztr.vec[1][0]= x; @@ -1355,7 +1354,7 @@ static int insert_key_button_exec (bContext *C, wmOperator *op) { Main *bmain= CTX_data_main(C); Scene *scene= CTX_data_scene(C); - PointerRNA ptr; + PointerRNA ptr= {{0}}; PropertyRNA *prop= NULL; char *path; float cfra= (float)CFRA; // XXX for now, don't bother about all the yucky offset crap @@ -1367,7 +1366,6 @@ static int insert_key_button_exec (bContext *C, wmOperator *op) flag = ANIM_get_keyframing_flags(scene, 1); /* try to insert keyframe 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)) { diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index b8edbb8c104..f3d4bea576f 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -357,7 +357,7 @@ static int make_proxy_exec (bContext *C, wmOperator *op) /* Generic itemf's for operators that take library args */ static EnumPropertyItem *proxy_group_object_itemf(bContext *C, PointerRNA *UNUSED(ptr), int *free) { - EnumPropertyItem *item= NULL, item_tmp; + EnumPropertyItem item_tmp= {0}, *item= NULL; int totitem= 0; int i= 0; Object *ob= ED_object_active_context(C); @@ -366,8 +366,6 @@ static EnumPropertyItem *proxy_group_object_itemf(bContext *C, PointerRNA *UNUSE if(!ob || !ob->dup_group) return DummyRNA_DEFAULT_items; - memset(&item_tmp, 0, sizeof(item_tmp)); - /* find the object to affect */ for (go= ob->dup_group->gobject.first; go; go= go->next) { item_tmp.identifier= item_tmp.name= go->ob->id.name+2; diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 0e8587e4642..f6d1f8d0bb8 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -1085,14 +1085,13 @@ static void icon_preview_startjob(void *customdata, short *stop, short *do_updat if(idtype == ID_IM) { Image *ima= (Image*)id; ImBuf *ibuf= NULL; - ImageUser iuser; + ImageUser iuser= {0}; /* ima->ok is zero when Image cannot load */ if(ima==NULL || ima->ok==0) return; /* setup dummy image user */ - memset(&iuser, 0, sizeof(ImageUser)); iuser.ok= iuser.framenr= 1; iuser.scene= sp->scene; diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 3e020e2a18c..bd4bae23c7d 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -5412,13 +5412,11 @@ static int texture_paint_camera_project_exec(bContext *C, wmOperator *op) { Image *image= BLI_findlink(&CTX_data_main(C)->image, RNA_enum_get(op->ptr, "image")); Scene *scene= CTX_data_scene(C); - ProjPaintState ps; + ProjPaintState ps= {0}; int orig_brush_size; IDProperty *idgroup; IDProperty *view_data= NULL; - memset(&ps, 0, sizeof(ps)); - project_state_init(C, OBACT, &ps); if(ps.ob==NULL || ps.ob->type != OB_MESH) { diff --git a/source/blender/imbuf/intern/iris.c b/source/blender/imbuf/intern/iris.c index 4e74132cdc7..51359dc0e68 100644 --- a/source/blender/imbuf/intern/iris.c +++ b/source/blender/imbuf/intern/iris.c @@ -175,9 +175,8 @@ static void readheader(FILE *inf, IMAGE *image) static int writeheader(FILE *outf, IMAGE *image) { - IMAGE t; + IMAGE t= {0}; - memset(&t, 0, sizeof(IMAGE)); fwrite(&t,sizeof(IMAGE),1,outf); fseek(outf,0,SEEK_SET); putshort(outf,image->imagic); diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h index edde9ead0e9..0dd9ff58453 100644 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@ -583,7 +583,7 @@ void RNA_pointer_create(struct ID *id, StructRNA *type, void *data, PointerRNA * void RNA_blender_rna_pointer_create(PointerRNA *r_ptr); void RNA_pointer_recast(PointerRNA *ptr, PointerRNA *r_ptr); -extern PointerRNA PointerRNA_NULL; +#define PointerRNA_NULL ((PointerRNA){{0}}) /* Structs */ diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index 0144a0c1bdf..fd66cf58b1d 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -90,8 +90,6 @@ void RNA_exit() /* Pointer */ -PointerRNA PointerRNA_NULL = {{0}, 0, 0}; - void RNA_main_pointer_create(struct Main *main, PointerRNA *r_ptr) { r_ptr->id.data= NULL; @@ -168,9 +166,8 @@ void RNA_blender_rna_pointer_create(PointerRNA *r_ptr) PointerRNA rna_pointer_inherit_refine(PointerRNA *ptr, StructRNA *type, void *data) { - PointerRNA result; - if(data) { + PointerRNA result; result.data= data; result.type= type; rna_pointer_inherit_id(type, ptr, &result); @@ -183,11 +180,11 @@ PointerRNA rna_pointer_inherit_refine(PointerRNA *ptr, StructRNA *type, void *da else result.type= type; } + return result; + } + else { + return PointerRNA_NULL; } - else - memset(&result, 0, sizeof(result)); - - return result; } /**/ @@ -1972,8 +1969,7 @@ PointerRNA RNA_property_pointer_get(PointerRNA *ptr, PropertyRNA *prop) return RNA_property_pointer_get(ptr, prop); } else { - PointerRNA result= {{0}}; - return result; + return PointerRNA_NULL; } } @@ -3561,12 +3557,9 @@ PointerRNA RNA_pointer_get(PointerRNA *ptr, const char *name) return RNA_property_pointer_get(ptr, prop); } else { - PointerRNA result; - printf("RNA_pointer_get: %s.%s not found.\n", ptr->type->identifier, name); - memset(&result, 0, sizeof(result)); - return result; + return PointerRNA_NULL; } } diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index e0257a38eb3..8b1a02cfd88 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -1156,8 +1156,7 @@ static int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyOb else { /* data==NULL, assign to RNA */ if(value == Py_None) { - PointerRNA valueptr; - memset(&valueptr, 0, sizeof(valueptr)); + PointerRNA valueptr= {{0}}; RNA_property_pointer_set(ptr, prop, valueptr); } else if(RNA_struct_is_a(param->ptr.type, ptype)) { diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index f6fb213358c..0578be94983 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -3426,12 +3426,10 @@ void wm_window_keymap(wmKeyConfig *keyconf) /* Generic itemf's for operators that take library args */ static EnumPropertyItem *rna_id_itemf(bContext *UNUSED(C), PointerRNA *UNUSED(ptr), int *free, ID *id, int local) { - EnumPropertyItem *item= NULL, item_tmp; + EnumPropertyItem item_tmp= {0}, *item= NULL; int totitem= 0; int i= 0; - memset(&item_tmp, 0, sizeof(item_tmp)); - for( ; id; id= id->next) { if(local==FALSE || id->lib==NULL) { item_tmp.identifier= item_tmp.name= id->name+2; |