diff options
author | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-20 01:38:35 +0400 |
---|---|---|
committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-20 01:38:35 +0400 |
commit | 9beef61199f4664b80f9e36617873bff7a6bb5ec (patch) | |
tree | 84f5e70e0949bb055bc98d012495f71af66fc1f4 /source/blender/modifiers/intern | |
parent | d91deb9e97d38fe3d2220255bbbc72ee1eee1124 (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/modifiers/intern')
-rw-r--r-- | source/blender/modifiers/intern/MOD_boolean.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_decimate.c | 6 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_meshdeform.c | 4 |
3 files changed, 6 insertions, 6 deletions
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; } |