diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-17 03:51:42 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-17 03:51:42 +0300 |
| commit | 9bcdb4b758d96d1fe5345858f6c61a90f7c57eac (patch) | |
| tree | 51d1be5c5d7243b9782a10e8ed99a153f5392ef7 /source/blender/editors | |
| parent | de9495e51915cae71ecdae05fdc21e5aef09ba4e (diff) | |
2.5: various warning fixes.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/animation/keyframing.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/armature/editarmature.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index 2cd2db3237a..5121932d0cc 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -1416,7 +1416,7 @@ static short incl_v3d_ob_shapekey (bKeyingSet *ks, const char mode[]) /* if ks is shapekey entry (this could be callled for separator before too!) */ if (ks->flag == -3) - sprintf(ks->name, newname); + BLI_strncpy(ks->name, newname, sizeof(ks->name)); /* if it gets here, it's ok */ return 1; diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 54da3901a59..5548700b2e1 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -747,7 +747,7 @@ int join_armature(Scene *scene, View3D *v3d) joined_armature_fix_links(ob, base->object, pchan, curbone); /* Rename pchan */ - sprintf(pchan->name, curbone->name); + BLI_strncpy(pchan->name, curbone->name, sizeof(pchan->name)); /* Jump Ship! */ BLI_remlink(curarm->edbo, curbone); diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 783636e3fdd..d69f318aa3f 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -4153,7 +4153,7 @@ void createTransNodeData(bContext *C, TransInfo *t) TransData *td; TransData2D *td2d; - CTX_DATA_COUNT(C, selected_nodes, t->total) + t->total= CTX_DATA_COUNT(C, selected_nodes); td = t->data = MEM_callocN(t->total*sizeof(TransData), "TransNode TransData"); td2d = t->data2d = MEM_callocN(t->total*sizeof(TransData2D), "TransNode TransData2D"); |