[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13998] trunk/blender/source/blender: Another big purge of warnings.
Joshua Leung
aligorith at gmail.com
Fri Mar 7 04:24:24 CET 2008
Revision: 13998
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13998
Author: aligorith
Date: 2008-03-07 04:24:23 +0100 (Fri, 07 Mar 2008)
Log Message:
-----------
Another big purge of warnings. (Main culprits this time were Campbell and Geoffrey):
* no newline at end of file (2-3)
* uninitialised vars (1)
* unused vars (1-2)
* assigning/comparing pointers and ints (numerous)
* etc.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/BME_eulers.c
trunk/blender/source/blender/blenkernel/intern/BME_mesh.c
trunk/blender/source/blender/blenkernel/intern/BME_tools.c
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/include/BIF_imasel.h
trunk/blender/source/blender/makesdna/DNA_space_types.h
trunk/blender/source/blender/python/BPY_interface.c
trunk/blender/source/blender/src/drawscript.c
Modified: trunk/blender/source/blender/blenkernel/intern/BME_eulers.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/BME_eulers.c 2008-03-07 02:40:12 UTC (rev 13997)
+++ trunk/blender/source/blender/blenkernel/intern/BME_eulers.c 2008-03-07 03:24:23 UTC (rev 13998)
@@ -972,4 +972,4 @@
BME_free_loop(bm, f2loop);
BME_free_poly(bm, f2);
return f1;
-}
\ No newline at end of file
+}
Modified: trunk/blender/source/blender/blenkernel/intern/BME_mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/BME_mesh.c 2008-03-07 02:40:12 UTC (rev 13997)
+++ trunk/blender/source/blender/blenkernel/intern/BME_mesh.c 2008-03-07 03:24:23 UTC (rev 13998)
@@ -153,8 +153,7 @@
}
void BME_model_end(BME_Mesh *bm){
- BME_Mesh *badmesh;
- int meshok,backupok, totvert, totedge, totpoly, totloop;
+ int meshok, totvert, totedge, totpoly, totloop;
totvert = BLI_countlist(&(bm->verts));
totedge = BLI_countlist(&(bm->edges));
@@ -166,7 +165,10 @@
if(bm->lpar) MEM_freeN(bm->lpar);
if(bm->plar) MEM_freeN(bm->plar);
- bm->vtar = bm->edar = bm->lpar = bm->plar = NULL;
+ bm->vtar = NULL;
+ bm->edar = NULL;
+ bm->lpar = NULL;
+ bm->plar = NULL;
bm->vtarlen = bm->edarlen = bm->lparlen = bm->plarlen = 1024;
Modified: trunk/blender/source/blender/blenkernel/intern/BME_tools.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/BME_tools.c 2008-03-07 02:40:12 UTC (rev 13997)
+++ trunk/blender/source/blender/blenkernel/intern/BME_tools.c 2008-03-07 03:24:23 UTC (rev 13998)
@@ -1089,7 +1089,7 @@
}
/* look for original edges, and remove them */
oe = e;
- while (e = BME_disk_next_edgeflag(oe, v, 0, BME_BEVEL_ORIG | BME_BEVEL_BEVEL)) {
+ while ( (e = BME_disk_next_edgeflag(oe, v, 0, BME_BEVEL_ORIG | BME_BEVEL_BEVEL)) ) {
/* join the faces (we'll split them later) */
f = BME_JFKE_safe(bm,e->loop->f,((BME_Loop*)e->loop->radial.next->data)->f,e);
if (!f); //printf("Non-manifold geometry not getting tagged right?\n");
Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cloth.c 2008-03-07 02:40:12 UTC (rev 13997)
+++ trunk/blender/source/blender/blenkernel/intern/cloth.c 2008-03-07 03:24:23 UTC (rev 13998)
@@ -1027,7 +1027,6 @@
float tnull[3] = {0,0,0};
int cache_there = 0;
Cloth *cloth = NULL;
- MFace *mfaces = NULL;
// If we have a clothObject, free it.
if ( clmd->clothObject != NULL )
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2008-03-07 02:40:12 UTC (rev 13997)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2008-03-07 03:24:23 UTC (rev 13998)
@@ -1425,12 +1425,7 @@
static void direct_link_script(FileData *fd, Script *script)
{
script->id.us = 1;
- script->py_draw =
- script->py_event =
- script->py_button =
- script->py_browsercallback =
- script->py_globaldict =
- script->flags = NULL;
+ SCRIPT_SET_NULL(script)
}
/* ************ READ CurveMapping *************** */
@@ -3742,7 +3737,7 @@
/*sc->script = NULL; - 2.45 set to null, better re-run the script */
if (scpt->script) {
scpt->script = newlibadr(fd, sc->id.lib, scpt->script);
- SCRIPT_SET_NULL(scpt->script);
+ SCRIPT_SET_NULL(scpt->script)
}
}
else if(sl->spacetype==SPACE_OOPS) {
@@ -3920,7 +3915,7 @@
/*sc->script = NULL; - 2.45 set to null, better re-run the script */
if (scpt->script) {
- SCRIPT_SET_NULL(scpt->script);
+ SCRIPT_SET_NULL(scpt->script)
}
}
else if(sl->spacetype==SPACE_OOPS) {
Modified: trunk/blender/source/blender/include/BIF_imasel.h
===================================================================
--- trunk/blender/source/blender/include/BIF_imasel.h 2008-03-07 02:40:12 UTC (rev 13997)
+++ trunk/blender/source/blender/include/BIF_imasel.h 2008-03-07 03:24:23 UTC (rev 13998)
@@ -34,6 +34,7 @@
struct SpaceImaSel;
struct ScrArea;
+struct ID;
void free_imasel(struct SpaceImaSel *simasel);
Modified: trunk/blender/source/blender/makesdna/DNA_space_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_space_types.h 2008-03-07 02:40:12 UTC (rev 13997)
+++ trunk/blender/source/blender/makesdna/DNA_space_types.h 2008-03-07 03:24:23 UTC (rev 13998)
@@ -304,7 +304,7 @@
char scriptname[256]; /* store the script file here so we can re-run it on loading blender, if "Enable Scripts" is on */
char scriptarg[256];
} Script;
-#define SCRIPT_SET_NULL(_script) _script->py_draw = _script->py_event = _script->py_button = _script->py_browsercallback = _script->py_globaldict = _script->flags = 0;
+#define SCRIPT_SET_NULL(_script) _script->py_draw = _script->py_event = _script->py_button = _script->py_browsercallback = _script->py_globaldict = NULL; _script->flags = 0;
#define SCRIPT_RUNNING 0x01
#define SCRIPT_GUI 0x02
#define SCRIPT_FILESEL 0x04
Modified: trunk/blender/source/blender/python/BPY_interface.c
===================================================================
--- trunk/blender/source/blender/python/BPY_interface.c 2008-03-07 02:40:12 UTC (rev 13997)
+++ trunk/blender/source/blender/python/BPY_interface.c 2008-03-07 03:24:23 UTC (rev 13998)
@@ -774,7 +774,7 @@
Text *text = NULL;
BPy_constant *info;
int len;
- char *buffer, *s;
+ char *buffer=NULL, *s;
FILE *fp = NULL;
@@ -2958,6 +2958,6 @@
Py_XDECREF((PyObject *)script->py_button);
Py_XDECREF((PyObject *)script->py_browsercallback);
Py_XDECREF((PyObject *)script->py_globaldict);
- SCRIPT_SET_NULL(script);
+ SCRIPT_SET_NULL(script)
}
-}
\ No newline at end of file
+}
Modified: trunk/blender/source/blender/src/drawscript.c
===================================================================
--- trunk/blender/source/blender/src/drawscript.c 2008-03-07 02:40:12 UTC (rev 13997)
+++ trunk/blender/source/blender/src/drawscript.c 2008-03-07 03:24:23 UTC (rev 13998)
@@ -97,7 +97,7 @@
/* Is this script loaded from a file and it needs running??? */
if ( (G.f & G_DOSCRIPTLINKS) &&
script->scriptname[0] != '\0' &&
- (script->flags == NULL &&
+ (script->flags == 0 &&
script->py_event == NULL &&
script->py_button == NULL &&
script->py_draw == NULL )
@@ -130,7 +130,7 @@
/* Is this script loaded from a file and it needs running??? */
if ( (G.f & G_DOSCRIPTLINKS) &&
script->scriptname[0] != '\0' &&
- (script->flags == NULL &&
+ (script->flags == 0 &&
script->py_event == NULL &&
script->py_button == NULL &&
script->py_draw == NULL )
More information about the Bf-blender-cvs
mailing list