[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35215] trunk/blender/source/blender: pedantic warning cleanup, also remove texspace_edit() since its been added using a different method.
Campbell Barton
ideasman42 at gmail.com
Sun Feb 27 09:31:11 CET 2011
Revision: 35215
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35215
Author: campbellbarton
Date: 2011-02-27 08:31:10 +0000 (Sun, 27 Feb 2011)
Log Message:
-----------
pedantic warning cleanup, also remove texspace_edit() since its been added using a different method.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_customdata_file.h
trunk/blender/source/blender/blenkernel/BKE_mesh.h
trunk/blender/source/blender/blenkernel/BKE_modifier.h
trunk/blender/source/blender/blenkernel/BKE_report.h
trunk/blender/source/blender/blenkernel/BKE_scene.h
trunk/blender/source/blender/blenkernel/intern/action.c
trunk/blender/source/blender/blenkernel/intern/anim_sys.c
trunk/blender/source/blender/blenkernel/intern/customdata_file.c
trunk/blender/source/blender/blenkernel/intern/mesh_validate.c
trunk/blender/source/blender/blenkernel/intern/nla.c
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/blenlib/BLI_bpath.h
trunk/blender/source/blender/blenlib/BLI_dynstr.h
trunk/blender/source/blender/blenlib/BLI_pbvh.h
trunk/blender/source/blender/blenlib/BLI_string.h
trunk/blender/source/blender/blenlib/intern/bpath.c
trunk/blender/source/blender/blenlib/intern/path_util.c
trunk/blender/source/blender/editors/animation/anim_draw.c
trunk/blender/source/blender/editors/animation/anim_markers.c
trunk/blender/source/blender/editors/animation/keyframes_draw.c
trunk/blender/source/blender/editors/animation/keyframes_edit.c
trunk/blender/source/blender/editors/animation/keyframing.c
trunk/blender/source/blender/editors/armature/BIF_retarget.h
trunk/blender/source/blender/editors/armature/editarmature_retarget.c
trunk/blender/source/blender/editors/armature/poselib.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/mesh/mesh_intern.h
trunk/blender/source/blender/editors/object/object_constraint.c
trunk/blender/source/blender/editors/object/object_transform.c
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/physics/physics_fluid.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/sculpt_paint/paint_utils.c
trunk/blender/source/blender/editors/space_api/spacetypes.c
trunk/blender/source/blender/editors/space_nla/nla_select.c
trunk/blender/source/blender/editors/space_outliner/outliner.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_scopes.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
trunk/blender/source/blender/makesrna/RNA_access.h
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_curves.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_scale.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c
trunk/blender/source/blender/nodes/intern/CMP_util.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_proc.c
trunk/blender/source/blender/python/intern/bpy_rna_array.c
Modified: trunk/blender/source/blender/blenkernel/BKE_customdata_file.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_customdata_file.h 2011-02-27 07:49:36 UTC (rev 35214)
+++ trunk/blender/source/blender/blenkernel/BKE_customdata_file.h 2011-02-27 08:31:10 UTC (rev 35215)
@@ -44,12 +44,12 @@
int cdf_read_open(CDataFile *cdf, char *filename);
int cdf_read_layer(CDataFile *cdf, CDataFileLayer *blay);
-int cdf_read_data(CDataFile *cdf, int size, void *data);
+int cdf_read_data(CDataFile *cdf, unsigned int size, void *data);
void cdf_read_close(CDataFile *cdf);
int cdf_write_open(CDataFile *cdf, char *filename);
int cdf_write_layer(CDataFile *cdf, CDataFileLayer *blay);
-int cdf_write_data(CDataFile *cdf, int size, void *data);
+int cdf_write_data(CDataFile *cdf, unsigned int size, void *data);
void cdf_write_close(CDataFile *cdf);
void cdf_remove(char *filename);
Modified: trunk/blender/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_mesh.h 2011-02-27 07:49:36 UTC (rev 35214)
+++ trunk/blender/source/blender/blenkernel/BKE_mesh.h 2011-02-27 08:31:10 UTC (rev 35215)
@@ -156,7 +156,7 @@
void mesh_translate(struct Mesh *me, float offset[3], int do_keys);
/* mesh_validate.c */
-int BKE_mesh_validate_arrays(struct Mesh *me, struct MVert *mverts, int totvert, struct MEdge *medges, int totedge, struct MFace *mfaces, int totface, const short do_verbose, const short do_fixes);
+int BKE_mesh_validate_arrays(struct Mesh *me, struct MVert *mverts, unsigned int totvert, struct MEdge *medges, unsigned int totedge, struct MFace *mfaces, unsigned int totface, const short do_verbose, const short do_fixes);
int BKE_mesh_validate(struct Mesh *me, int do_verbose);
int BKE_mesh_validate_dm(struct DerivedMesh *dm);
Modified: trunk/blender/source/blender/blenkernel/BKE_modifier.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_modifier.h 2011-02-27 07:49:36 UTC (rev 35214)
+++ trunk/blender/source/blender/blenkernel/BKE_modifier.h 2011-02-27 08:31:10 UTC (rev 35215)
@@ -305,7 +305,7 @@
int modifier_isEnabled(struct Scene *scene, struct ModifierData *md, int required_mode);
void modifier_setError(struct ModifierData *md, const char *format, ...)
#ifdef __GNUC__
-__attribute__ ((format (printf, 2, 3)));
+__attribute__ ((format (printf, 2, 3)))
#endif
;
Modified: trunk/blender/source/blender/blenkernel/BKE_report.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_report.h 2011-02-27 07:49:36 UTC (rev 35214)
+++ trunk/blender/source/blender/blenkernel/BKE_report.h 2011-02-27 08:31:10 UTC (rev 35215)
@@ -51,7 +51,7 @@
void BKE_report(ReportList *reports, ReportType type, const char *message);
void BKE_reportf(ReportList *reports, ReportType type, const char *format, ...)
#ifdef __GNUC__
-__attribute__ ((format (printf, 3, 4)));
+__attribute__ ((format (printf, 3, 4)))
#endif
;
Modified: trunk/blender/source/blender/blenkernel/BKE_scene.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_scene.h 2011-02-27 07:49:36 UTC (rev 35214)
+++ trunk/blender/source/blender/blenkernel/BKE_scene.h 2011-02-27 08:31:10 UTC (rev 35215)
@@ -78,7 +78,7 @@
char *scene_find_marker_name(struct Scene *scene, int frame);
char *scene_find_last_marker_name(struct Scene *scene, int frame);
-int scene_marker_tfm_translate(struct Scene *scene, int delta, int flag);
+int scene_marker_tfm_translate(struct Scene *scene, int delta, unsigned int flag);
int scene_marker_tfm_extend(struct Scene *scene, int delta, int flag, int frame, char side);
int scene_marker_tfm_scale(struct Scene *scene, float value, int flag);
Modified: trunk/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/action.c 2011-02-27 07:49:36 UTC (rev 35214)
+++ trunk/blender/source/blender/blenkernel/intern/action.c 2011-02-27 08:31:10 UTC (rev 35215)
@@ -1066,7 +1066,7 @@
bPoseChannel *pchanto, *pchanfrom;
if(to==NULL || from==NULL) {
- printf("pose result copy error to:%p from:%p\n", to, from); // debug temp
+ printf("pose result copy error to:%p from:%p\n", (void *)to, (void *)from); // debug temp
return;
}
Modified: trunk/blender/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim_sys.c 2011-02-27 07:49:36 UTC (rev 35214)
+++ trunk/blender/source/blender/blenkernel/intern/anim_sys.c 2011-02-27 08:31:10 UTC (rev 35215)
@@ -304,7 +304,7 @@
if ELEM3(NULL, srcAct, dstAct, basepath) {
if (G.f & G_DEBUG) {
printf("ERROR: action_partition_fcurves_by_basepath(%p, %p, %p) has insufficient info to work with\n",
- srcAct, dstAct, basepath);
+ (void *)srcAct, (void *)dstAct, (void *)basepath);
}
return;
}
Modified: trunk/blender/source/blender/blenkernel/intern/customdata_file.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata_file.c 2011-02-27 07:49:36 UTC (rev 35214)
+++ trunk/blender/source/blender/blenkernel/intern/customdata_file.c 2011-02-27 08:31:10 UTC (rev 35215)
@@ -310,11 +310,11 @@
return (fseek(cdf->readf, offset, SEEK_SET) == 0);
}
-int cdf_read_data(CDataFile *cdf, int size, void *data)
+int cdf_read_data(CDataFile *cdf, unsigned int size, void *data)
{
float *fdata;
- int a;
-
+ unsigned int a;
+
/* read data */
if(!fread(data, size, 1, cdf->readf))
return 0;
@@ -385,7 +385,7 @@
return 1;
}
-int cdf_write_data(CDataFile *cdf, int size, void *data)
+int cdf_write_data(CDataFile *cdf, unsigned int size, void *data)
{
/* write data */
if(!fwrite(data, size, 1, cdf->writef))
Modified: trunk/blender/source/blender/blenkernel/intern/mesh_validate.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh_validate.c 2011-02-27 07:49:36 UTC (rev 35214)
+++ trunk/blender/source/blender/blenkernel/intern/mesh_validate.c 2011-02-27 08:31:10 UTC (rev 35215)
@@ -112,7 +112,7 @@
}
-int BKE_mesh_validate_arrays(Mesh *me, MVert *UNUSED(mverts), int totvert, MEdge *medges, int totedge, MFace *mfaces, int totface, const short do_verbose, const short do_fixes)
+int BKE_mesh_validate_arrays(Mesh *me, MVert *UNUSED(mverts), unsigned int totvert, MEdge *medges, unsigned int totedge, MFace *mfaces, unsigned int totface, const short do_verbose, const short do_fixes)
{
# define PRINT if(do_verbose) printf
# define REMOVE_EDGE_TAG(_med) { _med->v2= _med->v1; do_edge_free= 1; }
@@ -122,7 +122,7 @@
MEdge *med;
MFace *mf;
MFace *mf_prev;
- int i;
+ unsigned int i;
int do_face_free= FALSE;
int do_edge_free= FALSE;
@@ -134,7 +134,7 @@
SortFace *sort_faces= MEM_callocN(sizeof(SortFace) * totface, "search faces");
SortFace *sf;
SortFace *sf_prev;
- int totsortface= 0;
+ unsigned int totsortface= 0;
BLI_assert(!(do_fixes && me == NULL));
Modified: trunk/blender/source/blender/blenkernel/intern/nla.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/nla.c 2011-02-27 07:49:36 UTC (rev 35214)
+++ trunk/blender/source/blender/blenkernel/intern/nla.c 2011-02-27 08:31:10 UTC (rev 35215)
@@ -1494,7 +1494,7 @@
if ELEM3(NULL, activeTrack, activeStrip, activeStrip->act) {
if (G.f & G_DEBUG) {
printf("NLA tweakmode enter - neither active requirement found \n");
- printf("\tactiveTrack = %p, activeStrip = %p \n", activeTrack, activeStrip);
+ printf("\tactiveTrack = %p, activeStrip = %p \n", (void *)activeTrack, (void *)activeStrip);
}
return 0;
}
Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c 2011-02-27 07:49:36 UTC (rev 35214)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c 2011-02-27 08:31:10 UTC (rev 35215)
@@ -829,7 +829,7 @@
/* markers need transforming from different parts of the code so have
* a generic function to do this */
-int scene_marker_tfm_translate(Scene *scene, int delta, int flag)
+int scene_marker_tfm_translate(Scene *scene, int delta, unsigned int flag)
{
TimeMarker *marker;
int tot= 0;
Modified: trunk/blender/source/blender/blenlib/BLI_bpath.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_bpath.h 2011-02-27 07:49:36 UTC (rev 35214)
+++ trunk/blender/source/blender/blenlib/BLI_bpath.h 2011-02-27 08:31:10 UTC (rev 35215)
@@ -44,7 +44,7 @@
const char* BLI_bpathIterator_getLib (struct BPathIterator *bpi);
const char* BLI_bpathIterator_getName (struct BPathIterator *bpi);
int BLI_bpathIterator_getType (struct BPathIterator *bpi);
-int BLI_bpathIterator_getPathMaxLen (struct BPathIterator *bpi);
+unsigned int BLI_bpathIterator_getPathMaxLen (struct BPathIterator *bpi);
const char* BLI_bpathIterator_getBasePath (struct BPathIterator *bpi);
void BLI_bpathIterator_step (struct BPathIterator *bpi);
int BLI_bpathIterator_isDone (struct BPathIterator *bpi);
Modified: trunk/blender/source/blender/blenlib/BLI_dynstr.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_dynstr.h 2011-02-27 07:49:36 UTC (rev 35214)
+++ trunk/blender/source/blender/blenlib/BLI_dynstr.h 2011-02-27 08:31:10 UTC (rev 35215)
@@ -79,7 +79,7 @@
*/
void BLI_dynstr_appendf (DynStr *ds, const char *format, ...)
#ifdef __GNUC__
-__attribute__ ((format (printf, 2, 3)));
+__attribute__ ((format (printf, 2, 3)))
#endif
;
void BLI_dynstr_vappendf (DynStr *ds, const char *format, va_list args);
Modified: trunk/blender/source/blender/blenlib/BLI_pbvh.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_pbvh.h 2011-02-27 07:49:36 UTC (rev 35214)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list