Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Bishop <nicholasbishop@gmail.com>2012-03-20 01:38:35 +0400
committerNicholas Bishop <nicholasbishop@gmail.com>2012-03-20 01:38:35 +0400
commit9beef61199f4664b80f9e36617873bff7a6bb5ec (patch)
tree84f5e70e0949bb055bc98d012495f71af66fc1f4 /source/blender
parentd91deb9e97d38fe3d2220255bbbc72ee1eee1124 (diff)
Fix format string warnings (gcc) by using string literals.
gcc 4.6 was giving warnings like this: "warning: format not a string literal and no format arguments [-Wformat-security]"
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenkernel/intern/DerivedMesh.c6
-rw-r--r--source/blender/blenkernel/intern/cloth.c8
-rw-r--r--source/blender/editors/armature/meshlaplacian.c2
-rw-r--r--source/blender/modifiers/intern/MOD_boolean.c2
-rw-r--r--source/blender/modifiers/intern/MOD_decimate.c6
-rw-r--r--source/blender/modifiers/intern/MOD_meshdeform.c4
6 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index e533fa77135..bf3f461d3f5 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1474,7 +1474,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
if(!modifier_isEnabled(scene, md, required_mode)) continue;
if(mti->type == eModifierTypeType_OnlyDeform && !useDeform) continue;
if((mti->flags & eModifierTypeFlag_RequiresOriginalData) && dm) {
- modifier_setError(md, TIP_("Modifier requires original data, bad stack position."));
+ modifier_setError(md, "%s", TIP_("Modifier requires original data, bad stack position."));
continue;
}
if(sculpt_mode && (!has_multires || multires_applied)) {
@@ -1487,7 +1487,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
unsupported|= multires_applied;
if(unsupported) {
- modifier_setError(md, TIP_("Not supported in sculpt mode."));
+ modifier_setError(md, "%s", TIP_("Not supported in sculpt mode."));
continue;
}
}
@@ -1841,7 +1841,7 @@ int editbmesh_modifier_is_enabled(Scene *scene, ModifierData *md, DerivedMesh *d
if(!modifier_isEnabled(scene, md, required_mode)) return 0;
if((mti->flags & eModifierTypeFlag_RequiresOriginalData) && dm) {
- modifier_setError(md, TIP_("Modifier requires original data, bad stack position."));
+ modifier_setError(md, "%s", TIP_("Modifier requires original data, bad stack position."));
return 0;
}
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c
index d41b3684d9f..3fb8a3501d0 100644
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -829,7 +829,7 @@ static int cloth_from_object(Object *ob, ClothModifierData *clmd, DerivedMesh *d
clmd->clothObject->edgehash = NULL;
}
else if (!clmd->clothObject) {
- modifier_setError(&(clmd->modifier), TIP_("Out of memory on allocating clmd->clothObject."));
+ modifier_setError(&(clmd->modifier), "%s", TIP_("Out of memory on allocating clmd->clothObject."));
return 0;
}
@@ -894,7 +894,7 @@ static int cloth_from_object(Object *ob, ClothModifierData *clmd, DerivedMesh *d
if ( !cloth_build_springs ( clmd, dm ) )
{
cloth_free_modifier ( clmd );
- modifier_setError(&(clmd->modifier), TIP_("Can't build springs."));
+ modifier_setError(&(clmd->modifier), "%s", TIP_("Can't build springs."));
printf("cloth_free_modifier cloth_build_springs\n");
return 0;
}
@@ -940,7 +940,7 @@ static void cloth_from_mesh ( ClothModifierData *clmd, DerivedMesh *dm )
if ( clmd->clothObject->verts == NULL )
{
cloth_free_modifier ( clmd );
- modifier_setError(&(clmd->modifier), TIP_("Out of memory on allocating clmd->clothObject->verts."));
+ modifier_setError(&(clmd->modifier), "%s", TIP_("Out of memory on allocating clmd->clothObject->verts."));
printf("cloth_free_modifier clmd->clothObject->verts\n");
return;
}
@@ -951,7 +951,7 @@ static void cloth_from_mesh ( ClothModifierData *clmd, DerivedMesh *dm )
if ( clmd->clothObject->mfaces == NULL )
{
cloth_free_modifier ( clmd );
- modifier_setError(&(clmd->modifier), TIP_("Out of memory on allocating clmd->clothObject->mfaces."));
+ modifier_setError(&(clmd->modifier), "%s", TIP_("Out of memory on allocating clmd->clothObject->mfaces."));
printf("cloth_free_modifier clmd->clothObject->mfaces\n");
return;
}
diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c
index 17c6e25b52b..de9b4a890cb 100644
--- a/source/blender/editors/armature/meshlaplacian.c
+++ b/source/blender/editors/armature/meshlaplacian.c
@@ -1716,7 +1716,7 @@ static void meshdeform_matrix_solve(MeshDeformModifierData *mmd, MeshDeformBind
}
}
else {
- modifier_setError(&mmd->modifier, TIP_("Failed to find bind solution (increase precision?)."));
+ modifier_setError(&mmd->modifier, "%s", TIP_("Failed to find bind solution (increase precision?)."));
error("Mesh Deform: failed to find bind solution.");
break;
}
diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c
index 3bf30e5fa14..2b3c1f00541 100644
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@ -156,7 +156,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
if(result)
return result;
else
- modifier_setError(md, TIP_("Can't execute boolean operation."));
+ modifier_setError(md, "%s", TIP_("Can't execute boolean operation."));
}
return derivedData;
diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c
index 5fc3c506d36..3c3381dc36b 100644
--- a/source/blender/modifiers/intern/MOD_decimate.c
+++ b/source/blender/modifiers/intern/MOD_decimate.c
@@ -98,7 +98,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
}
if(numTris<3) {
- modifier_setError(md, TIP_("Modifier requires more than 3 input faces (triangles)."));
+ modifier_setError(md, "%s", TIP_("Modifier requires more than 3 input faces (triangles)."));
dm = CDDM_copy(dm);
return dm;
}
@@ -173,12 +173,12 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
CDDM_calc_edges_tessface(result);
}
else
- modifier_setError(md, TIP_("Out of memory."));
+ modifier_setError(md, "%s", TIP_("Out of memory."));
LOD_FreeDecimationData(&lod);
}
else
- modifier_setError(md, TIP_("Non-manifold mesh as input."));
+ modifier_setError(md, "%s", TIP_("Non-manifold mesh as input."));
MEM_freeN(lod.vertex_buffer);
MEM_freeN(lod.vertex_normal_buffer);
diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c
index afee0e2c79e..c8ce1b9b88a 100644
--- a/source/blender/modifiers/intern/MOD_meshdeform.c
+++ b/source/blender/modifiers/intern/MOD_meshdeform.c
@@ -218,7 +218,7 @@ static void meshdeformModifier_do(
}
if(!cagedm) {
- modifier_setError(md, TIP_("Can't get mesh from cage object."));
+ modifier_setError(md, "%s", TIP_("Can't get mesh from cage object."));
return;
}
@@ -255,7 +255,7 @@ static void meshdeformModifier_do(
cagedm->release(cagedm);
return;
} else if (mmd->bindcagecos == NULL) {
- modifier_setError(md, TIP_("Bind data missing."));
+ modifier_setError(md, "%s", TIP_("Bind data missing."));
cagedm->release(cagedm);
return;
}