From 1cee3e53fc9e5d056c3b5f37d3ec19105a0cfeed Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 3 Dec 2013 09:12:44 +1100 Subject: Code Cleanup: use BLI_strncpy when copying into fixed sized buffers --- source/blender/blenkernel/intern/particle.c | 2 +- source/blender/editors/object/object_add.c | 2 +- source/blender/editors/transform/transform_orientations.c | 10 +++++----- source/blender/editors/util/ed_util.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 24cf98d957d..a819b73ca3c 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -3510,7 +3510,7 @@ ModifierData *object_add_particle_system(Scene *scene, Object *ob, const char *n if (BLI_countlist(&ob->particlesystem) > 1) BLI_snprintf(psys->name, sizeof(psys->name), DATA_("ParticleSystem %i"), BLI_countlist(&ob->particlesystem)); else - strcpy(psys->name, DATA_("ParticleSystem")); + BLI_strncpy(psys->name, DATA_("ParticleSystem"), sizeof(psys->name)); md = modifier_new(eModifierType_ParticleSystem); diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 798bf7c6318..7e55d082883 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -999,7 +999,7 @@ static int object_speaker_add_exec(bContext *C, wmOperator *op) BKE_nlatrack_add_strip(nlt, strip); /* auto-name the strip, and give the track an interesting name */ - strcpy(nlt->name, DATA_("SoundTrack")); + BLI_strncpy(nlt->name, DATA_("SoundTrack"), sizeof(nlt->name)); BKE_nlastrip_validate_name(adt, strip); WM_event_add_notifier(C, NC_ANIMATION | ND_NLA | NA_EDITED, NULL); diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index 6dc685c0148..be8bc460764 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -458,25 +458,25 @@ void initTransformOrientation(bContext *C, TransInfo *t) switch (t->current_orientation) { case V3D_MANIP_GLOBAL: unit_m3(t->spacemtx); - strcpy(t->spacename, IFACE_("global")); + BLI_strncpy(t->spacename, IFACE_("global"), sizeof(t->spacename)); break; case V3D_MANIP_GIMBAL: unit_m3(t->spacemtx); if (gimbal_axis(ob, t->spacemtx)) { - strcpy(t->spacename, IFACE_("gimbal")); + BLI_strncpy(t->spacename, IFACE_("gimbal"), sizeof(t->spacename)); break; } /* fall-through */ /* no gimbal fallthrough to normal */ case V3D_MANIP_NORMAL: if (obedit || (ob && ob->mode & OB_MODE_POSE)) { - strcpy(t->spacename, IFACE_("normal")); + BLI_strncpy(t->spacename, IFACE_("normal"), sizeof(t->spacename)); ED_getTransformOrientationMatrix(C, t->spacemtx, (v3d->around == V3D_ACTIVE)); break; } /* fall-through */ /* we define 'normal' as 'local' in Object mode */ case V3D_MANIP_LOCAL: - strcpy(t->spacename, IFACE_("local")); + BLI_strncpy(t->spacename, IFACE_("local"), sizeof(t->spacename)); if (ob) { copy_m3_m4(t->spacemtx, ob->obmat); @@ -493,7 +493,7 @@ void initTransformOrientation(bContext *C, TransInfo *t) RegionView3D *rv3d = t->ar->regiondata; float mat[3][3]; - strcpy(t->spacename, IFACE_("view")); + BLI_strncpy(t->spacename, IFACE_("view"), sizeof(t->spacename)); copy_m3_m4(mat, rv3d->viewinv); normalize_m3(mat); copy_m3_m3(t->spacemtx, mat); diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c index 7424acd752f..0e357dc53c1 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -173,8 +173,8 @@ void unpack_menu(bContext *C, const char *opname, const char *id_name, const cha pup = uiPupMenuBegin(C, IFACE_("Unpack File"), ICON_NONE); layout = uiPupMenuLayout(pup); - strcpy(line, IFACE_("Remove Pack")); - props_ptr = uiItemFullO_ptr(layout, ot, line, ICON_NONE, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS); + props_ptr = uiItemFullO_ptr(layout, ot, IFACE_("Remove Pack"), ICON_NONE, + NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS); RNA_enum_set(&props_ptr, "method", PF_REMOVE); RNA_string_set(&props_ptr, "id", id_name); -- cgit v1.2.3