[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45004] trunk/blender/source/blender: Fix format string warnings (gcc) by using string literals.
Nicholas Bishop
nicholasbishop at gmail.com
Mon Mar 19 22:38:40 CET 2012
Revision: 45004
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45004
Author: nicholasbishop
Date: 2012-03-19 21:38:35 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
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]"
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/editors/armature/meshlaplacian.c
trunk/blender/source/blender/modifiers/intern/MOD_boolean.c
trunk/blender/source/blender/modifiers/intern/MOD_decimate.c
trunk/blender/source/blender/modifiers/intern/MOD_meshdeform.c
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-03-19 21:27:24 UTC (rev 45003)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-03-19 21:38:35 UTC (rev 45004)
@@ -1474,7 +1474,7 @@
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 @@
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 @@
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;
}
Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cloth.c 2012-03-19 21:27:24 UTC (rev 45003)
+++ trunk/blender/source/blender/blenkernel/intern/cloth.c 2012-03-19 21:38:35 UTC (rev 45004)
@@ -829,7 +829,7 @@
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 @@
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 @@
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 @@
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;
}
Modified: trunk/blender/source/blender/editors/armature/meshlaplacian.c
===================================================================
--- trunk/blender/source/blender/editors/armature/meshlaplacian.c 2012-03-19 21:27:24 UTC (rev 45003)
+++ trunk/blender/source/blender/editors/armature/meshlaplacian.c 2012-03-19 21:38:35 UTC (rev 45004)
@@ -1716,7 +1716,7 @@
}
}
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;
}
Modified: trunk/blender/source/blender/modifiers/intern/MOD_boolean.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_boolean.c 2012-03-19 21:27:24 UTC (rev 45003)
+++ trunk/blender/source/blender/modifiers/intern/MOD_boolean.c 2012-03-19 21:38:35 UTC (rev 45004)
@@ -156,7 +156,7 @@
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;
Modified: trunk/blender/source/blender/modifiers/intern/MOD_decimate.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_decimate.c 2012-03-19 21:27:24 UTC (rev 45003)
+++ trunk/blender/source/blender/modifiers/intern/MOD_decimate.c 2012-03-19 21:38:35 UTC (rev 45004)
@@ -98,7 +98,7 @@
}
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 @@
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);
Modified: trunk/blender/source/blender/modifiers/intern/MOD_meshdeform.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_meshdeform.c 2012-03-19 21:27:24 UTC (rev 45003)
+++ trunk/blender/source/blender/modifiers/intern/MOD_meshdeform.c 2012-03-19 21:38:35 UTC (rev 45004)
@@ -218,7 +218,7 @@
}
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 @@
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;
}
More information about the Bf-blender-cvs
mailing list