[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33435] trunk/blender: fix for some pedantic warnings.
Campbell Barton
ideasman42 at gmail.com
Fri Dec 3 02:52:29 CET 2010
Revision: 33435
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33435
Author: campbellbarton
Date: 2010-12-03 02:52:28 +0100 (Fri, 03 Dec 2010)
Log Message:
-----------
fix for some pedantic warnings.
Modified Paths:
--------------
trunk/blender/intern/guardedalloc/intern/mallocn.c
trunk/blender/release/datafiles/datatoc.py
trunk/blender/source/blender/blenkernel/BKE_deform.h
trunk/blender/source/blender/blenkernel/BKE_fcurve.h
trunk/blender/source/blender/blenkernel/intern/deform.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/smoke.c
trunk/blender/source/blender/blenlib/BLI_math_rotation.h
trunk/blender/source/blender/blenlib/intern/graph.c
trunk/blender/source/blender/blenlib/intern/scanfill.c
trunk/blender/source/blender/editors/animation/anim_filter.c
trunk/blender/source/blender/editors/animation/keyframing.c
trunk/blender/source/blender/editors/armature/editarmature_retarget.c
trunk/blender/source/blender/editors/armature/poseobject.c
trunk/blender/source/blender/editors/armature/reeb.c
trunk/blender/source/blender/editors/curve/curve_intern.h
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/curve/editfont.c
trunk/blender/source/blender/editors/curve/lorem.c
trunk/blender/source/blender/editors/datafiles/Bfont.c
trunk/blender/source/blender/editors/include/ED_anim_api.h
trunk/blender/source/blender/editors/include/ED_curve.h
trunk/blender/source/blender/editors/include/ED_keyframes_edit.h
trunk/blender/source/blender/editors/include/UI_interface.h
trunk/blender/source/blender/editors/include/UI_view2d.h
trunk/blender/source/blender/editors/interface/view2d.c
trunk/blender/source/blender/editors/mesh/editface.c
trunk/blender/source/blender/editors/mesh/editmesh_loop.c
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/render/render_preview.c
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
trunk/blender/source/blender/editors/space_action/action_select.c
trunk/blender/source/blender/editors/space_file/file_draw.c
trunk/blender/source/blender/editors/space_logic/logic_window.c
trunk/blender/source/blender/editors/space_nla/nla_intern.h
trunk/blender/source/blender/editors/space_node/node_draw.c
trunk/blender/source/blender/makesdna/DNA_action_types.h
trunk/blender/source/blender/makesdna/DNA_anim_types.h
trunk/blender/source/blender/makesdna/DNA_armature_types.h
trunk/blender/source/blender/makesdna/DNA_constraint_types.h
trunk/blender/source/blender/makesdna/DNA_curve_types.h
trunk/blender/source/blender/makesdna/DNA_windowmanager_types.h
trunk/blender/source/blender/makesdna/intern/makesdna.c
trunk/blender/source/blender/makesrna/RNA_types.h
trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c
trunk/blender/source/blender/modifiers/intern/MOD_meshdeform.c
trunk/blender/source/blender/modifiers/intern/MOD_mirror.c
trunk/blender/source/blender/python/generic/mathutils_color.c
trunk/blender/source/blender/python/generic/mathutils_vector.c
trunk/blender/source/blender/python/intern/bpy_util.c
trunk/blender/source/blender/render/intern/source/texture.c
trunk/blender/source/blender/windowmanager/WM_api.h
trunk/blender/source/blender/windowmanager/intern/wm_jobs.c
trunk/blender/source/blender/windowmanager/wm_cursors.h
Modified: trunk/blender/intern/guardedalloc/intern/mallocn.c
===================================================================
--- trunk/blender/intern/guardedalloc/intern/mallocn.c 2010-12-02 23:50:10 UTC (rev 33434)
+++ trunk/blender/intern/guardedalloc/intern/mallocn.c 2010-12-03 01:52:28 UTC (rev 33435)
@@ -502,7 +502,7 @@
}
while(membl) {
if (pydict) {
- fprintf(stderr, "{'len':" SIZET_FORMAT ", 'name':'''%s''', 'pointer':'%p'},\\\n", SIZET_ARG(membl->len), membl->name, membl+1);
+ fprintf(stderr, "{'len':" SIZET_FORMAT ", 'name':'''%s''', 'pointer':'%p'},\\\n", SIZET_ARG(membl->len), membl->name, (void *)(membl+1));
} else {
#ifdef DEBUG_MEMCOUNTER
print_error("%s len: " SIZET_FORMAT " %p, count: %d\n", membl->name, SIZET_ARG(membl->len), membl+1, membl->_count);
Modified: trunk/blender/release/datafiles/datatoc.py
===================================================================
--- trunk/blender/release/datafiles/datatoc.py 2010-12-02 23:50:10 UTC (rev 33434)
+++ trunk/blender/release/datafiles/datatoc.py 2010-12-03 01:52:28 UTC (rev 33435)
@@ -45,8 +45,8 @@
size = fpin.tell()
fpin.seek(0)
-if filename[0] == ".":
- filename = filename[1:]
+if filename[0:2] == "." + os.sep:
+ filename = filename[2:]
cname = filename + ".c"
sys.stdout.write("Making C file <%s>\n" % cname)
Modified: trunk/blender/source/blender/blenkernel/BKE_deform.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_deform.h 2010-12-02 23:50:10 UTC (rev 33434)
+++ trunk/blender/source/blender/blenkernel/BKE_deform.h 2010-12-03 01:52:28 UTC (rev 33435)
@@ -49,8 +49,8 @@
int defgroup_name_index(struct Object *ob, const char *name);
void defgroup_unique_name(struct bDeformGroup *dg, struct Object *ob);
-struct MDeformWeight *defvert_find_index(const struct MDeformVert *dv, int defgroup);
-struct MDeformWeight *defvert_verify_index(struct MDeformVert *dv, int defgroup);
+struct MDeformWeight *defvert_find_index(const struct MDeformVert *dv, const int defgroup);
+struct MDeformWeight *defvert_verify_index(struct MDeformVert *dv, const int defgroup);
float defvert_find_weight(const struct MDeformVert *dvert, int group_num);
float defvert_array_find_weight_safe(const struct MDeformVert *dvert, int index, int group_num);
Modified: trunk/blender/source/blender/blenkernel/BKE_fcurve.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_fcurve.h 2010-12-02 23:50:10 UTC (rev 33434)
+++ trunk/blender/source/blender/blenkernel/BKE_fcurve.h 2010-12-03 01:52:28 UTC (rev 33435)
@@ -140,7 +140,7 @@
/* modifier only modifies the values of points (but times stay the same) */
FMI_TYPE_REPLACE_VALUES,
/* modifier generates a curve regardless of what came before */
- FMI_TYPE_GENERATE_CURVE,
+ FMI_TYPE_GENERATE_CURVE
} eFMI_Action_Types;
/* Flags for the requirements of a FModifier Type */
@@ -152,7 +152,7 @@
*/
FMI_REQUIRES_NOTHING = (1<<1),
/* refer to modifier instance */
- FMI_REQUIRES_RUNTIME_CHECK = (1<<2),
+ FMI_REQUIRES_RUNTIME_CHECK = (1<<2)
} eFMI_Requirement_Flags;
/* Function Prototypes for FModifierTypeInfo's */
Modified: trunk/blender/source/blender/blenkernel/intern/deform.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/deform.c 2010-12-02 23:50:10 UTC (rev 33434)
+++ trunk/blender/source/blender/blenkernel/intern/deform.c 2010-12-03 01:52:28 UTC (rev 33435)
@@ -463,7 +463,7 @@
}
-MDeformWeight *defvert_find_index(const MDeformVert *dvert, int defgroup)
+MDeformWeight *defvert_find_index(const MDeformVert *dvert, const int defgroup)
{
if(dvert && defgroup >= 0) {
MDeformWeight *dw = dvert->dw;
@@ -479,7 +479,7 @@
/* Ensures that mv has a deform weight entry for the specified defweight group */
/* Note this function is mirrored in editmesh_tools.c, for use for editvertices */
-MDeformWeight *defvert_verify_index(MDeformVert *dv, int defgroup)
+MDeformWeight *defvert_verify_index(MDeformVert *dv, const int defgroup)
{
MDeformWeight *newdw;
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2010-12-02 23:50:10 UTC (rev 33434)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2010-12-03 01:52:28 UTC (rev 33435)
@@ -652,6 +652,7 @@
}
/* Smoke functions */
+#if 0
static int ptcache_totpoint_smoke_turbulence(void *smoke_v, int UNUSED(cfra))
{
SmokeModifierData *smd= (SmokeModifierData *)smoke_v;
@@ -663,6 +664,7 @@
else
return 0;
}
+#endif
// forward decleration
static int ptcache_file_write(PTCacheFile *pf, void *f, size_t tot, int size);
Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/smoke.c 2010-12-02 23:50:10 UTC (rev 33434)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c 2010-12-03 01:52:28 UTC (rev 33435)
@@ -110,6 +110,8 @@
{
gettimeofday ( &_tend,&tz );
}
+
+#if 0 // unused
static double tval()
{
double t1, t2;
@@ -118,6 +120,7 @@
return t2-t1;
}
#endif
+#endif
struct Object;
struct Scene;
Modified: trunk/blender/source/blender/blenlib/BLI_math_rotation.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_math_rotation.h 2010-12-02 23:50:10 UTC (rev 33434)
+++ trunk/blender/source/blender/blenlib/BLI_math_rotation.h 2010-12-03 01:52:28 UTC (rev 33435)
@@ -131,7 +131,7 @@
EULER_ORDER_YXZ,
EULER_ORDER_YZX,
EULER_ORDER_ZXY,
- EULER_ORDER_ZYX,
+ EULER_ORDER_ZYX
/* there are 6 more entries with dulpicate entries included */
} eEulerRotationOrders;
Modified: trunk/blender/source/blender/blenlib/intern/graph.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/graph.c 2010-12-02 23:50:10 UTC (rev 33434)
+++ trunk/blender/source/blender/blenlib/intern/graph.c 2010-12-03 01:52:28 UTC (rev 33435)
@@ -128,7 +128,7 @@
{
if (node->degree != node->flag)
{
- printf("error in node [%p]. Added only %i arcs out of %i\n", node, node->flag, node->degree);
+ printf("error in node [%p]. Added only %i arcs out of %i\n", (void *)node, node->flag, node->degree);
}
}
}
@@ -161,7 +161,7 @@
if (node->degree != node->flag)
{
- printf("error in node [%p]. Added only %i arcs out of %i\n", node, node->flag, node->degree);
+ printf("error in node [%p]. Added only %i arcs out of %i\n", (void *)node, node->flag, node->degree);
}
}
Modified: trunk/blender/source/blender/blenlib/intern/scanfill.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/scanfill.c 2010-12-02 23:50:10 UTC (rev 33434)
+++ trunk/blender/source/blender/blenlib/intern/scanfill.c 2010-12-03 01:52:28 UTC (rev 33435)
@@ -360,7 +360,7 @@
sc= (ScFillVert *)bsearch(&scsearch,scdata,len,
sizeof(ScFillVert), vergscdata);
- if(sc==0) printf("Error in search edge: %p\n",eed);
+ if(sc==0) printf("Error in search edge: %p\n", (void *)eed);
else if(addedgetoscanvert(sc,eed)==0) return sc;
return 0;
Modified: trunk/blender/source/blender/editors/animation/anim_filter.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_filter.c 2010-12-02 23:50:10 UTC (rev 33434)
+++ trunk/blender/source/blender/editors/animation/anim_filter.c 2010-12-03 01:52:28 UTC (rev 33435)
@@ -2048,7 +2048,7 @@
if ((ads->source == NULL) || (GS(ads->source->name)!=ID_SCE)) {
printf("DopeSheet Error: Not scene!\n");
if (G.f & G_DEBUG)
- printf("\tPointer = %p, Name = '%s' \n", ads->source, (ads->source)?ads->source->name:NULL);
+ printf("\tPointer = %p, Name = '%s' \n", (void *)ads->source, (ads->source)?ads->source->name:NULL);
return 0;
}
Modified: trunk/blender/source/blender/editors/animation/keyframing.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframing.c 2010-12-02 23:50:10 UTC (rev 33434)
+++ trunk/blender/source/blender/editors/animation/keyframing.c 2010-12-03 01:52:28 UTC (rev 33435)
@@ -1401,7 +1401,7 @@
}
}
else if (G.f & G_DEBUG) {
- printf("ptr.data = %p, prop = %p,", ptr.data, prop);
+ printf("ptr.data = %p, prop = %p,", (void *)ptr.data, (void *)prop);
if(prop)
printf("animateable = %d \n", RNA_property_animateable(&ptr, prop));
else
@@ -1476,7 +1476,7 @@
printf("Button Delete-Key: no path to property \n");
}
else if (G.f & G_DEBUG) {
- printf("ptr.data = %p, prop = %p \n", ptr.data, prop);
+ printf("ptr.data = %p, prop = %p \n", (void *)ptr.data, (void *)prop);
}
Modified: trunk/blender/source/blender/editors/armature/editarmature_retarget.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature_retarget.c 2010-12-02 23:50:10 UTC (rev 33434)
+++ trunk/blender/source/blender/editors/armature/editarmature_retarget.c 2010-12-03 01:52:28 UTC (rev 33435)
@@ -1415,7 +1415,7 @@
void RIG_printNode(RigNode *node, char name[])
{
- printf("%s %p %i <%0.3f, %0.3f, %0.3f>\n", name, node, node->degree, node->p[0], node->p[1], node->p[2]);
+ printf("%s %p %i <%0.3f, %0.3f, %0.3f>\n", name, (void *)node, node->degree, node->p[0], node->p[1], node->p[2]);
if (node->symmetry_flag & SYM_TOPOLOGICAL)
{
Modified: trunk/blender/source/blender/editors/armature/poseobject.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poseobject.c 2010-12-02 23:50:10 UTC (rev 33434)
+++ trunk/blender/source/blender/editors/armature/poseobject.c 2010-12-03 01:52:28 UTC (rev 33435)
@@ -72,7 +72,7 @@
/* ************* XXX *************** */
static int pupmenu(const char *UNUSED(dummy)) {return 0;}
-static void error(const char *UNUSED(dummy)) {};
+static void error(const char *UNUSED(dummy)) {}
static void BIF_undo_push(const char *UNUSED(dummy)) {}
/* ************* XXX *************** */
Modified: trunk/blender/source/blender/editors/armature/reeb.c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list