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/blenkernel/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/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 6 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/cloth.c | 8 |
2 files changed, 7 insertions, 7 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; } |