[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42831] trunk/blender: Code cleanup: fix some clang static checker warnings.
Brecht Van Lommel
brechtvanlommel at pandora.be
Thu Dec 22 21:29:53 CET 2011
Revision: 42831
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42831
Author: blendix
Date: 2011-12-22 20:29:44 +0000 (Thu, 22 Dec 2011)
Log Message:
-----------
Code cleanup: fix some clang static checker warnings.
Modified Paths:
--------------
trunk/blender/intern/iksolver/intern/IK_Solver.cpp
trunk/blender/intern/mikktspace/mikktspace.c
trunk/blender/intern/opennl/intern/opennl.c
trunk/blender/intern/opennl/superlu/get_perm_c.c
trunk/blender/intern/opennl/superlu/scolumn_bmod.c
trunk/blender/intern/opennl/superlu/strsv.c
trunk/blender/intern/opennl/superlu/sutil.c
trunk/blender/intern/opennl/superlu/util.h
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/fcurve.c
trunk/blender/source/blender/blenkernel/intern/movieclip.c
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
trunk/blender/source/blender/blenkernel/intern/tracking.c
trunk/blender/source/blender/editors/animation/anim_channels_edit.c
trunk/blender/source/blender/editors/animation/anim_filter.c
trunk/blender/source/blender/gpu/intern/gpu_codegen.c
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/gpu/intern/gpu_material.c
trunk/blender/source/blender/render/intern/raytrace/rayobject_octree.cpp
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/pixelshading.c
trunk/blender/source/blender/render/intern/source/rayshade.c
trunk/blender/source/blender/render/intern/source/renderdatabase.c
trunk/blender/source/blender/render/intern/source/shadeoutput.c
trunk/blender/source/blender/render/intern/source/strand.c
trunk/blender/source/blender/render/intern/source/volumetric.c
Modified: trunk/blender/intern/iksolver/intern/IK_Solver.cpp
===================================================================
--- trunk/blender/intern/iksolver/intern/IK_Solver.cpp 2011-12-22 19:09:21 UTC (rev 42830)
+++ trunk/blender/intern/iksolver/intern/IK_Solver.cpp 2011-12-22 20:29:44 UTC (rev 42831)
@@ -225,11 +225,12 @@
void IK_GetBasisChange(IK_Segment *seg, float basis_change[][3])
{
IK_QSegment *qseg = (IK_QSegment*)seg;
- const MT_Matrix3x3& change = qseg->BasisChange();
if (qseg->Translational() && qseg->Composite())
qseg = qseg->Composite();
+ const MT_Matrix3x3& change = qseg->BasisChange();
+
// convert from moto row major to blender column major
basis_change[0][0] = (float)change[0][0];
basis_change[1][0] = (float)change[0][1];
Modified: trunk/blender/intern/mikktspace/mikktspace.c
===================================================================
--- trunk/blender/intern/mikktspace/mikktspace.c 2011-12-22 19:09:21 UTC (rev 42830)
+++ trunk/blender/intern/mikktspace/mikktspace.c 2011-12-22 20:29:44 UTC (rev 42831)
@@ -1350,7 +1350,6 @@
for(s=0; s<iUniqueSubGroups; s++)
free(pUniSubGroups[s].pTriMembers);
iUniqueTspaces += iUniqueSubGroups;
- iUniqueSubGroups = 0;
}
// clean up
Modified: trunk/blender/intern/opennl/intern/opennl.c
===================================================================
--- trunk/blender/intern/opennl/intern/opennl.c 2011-12-22 19:09:21 UTC (rev 42830)
+++ trunk/blender/intern/opennl/intern/opennl.c 2011-12-22 20:29:44 UTC (rev 42831)
@@ -1137,7 +1137,7 @@
/* SuperLU variables */
SuperMatrix B;
- NLint info;
+ NLint info = 0;
for(j=0; j<context->nb_rhs; j++, b+=n, x+=n) {
/* Create superlu array for B */
Modified: trunk/blender/intern/opennl/superlu/get_perm_c.c
===================================================================
--- trunk/blender/intern/opennl/superlu/get_perm_c.c 2011-12-22 19:09:21 UTC (rev 42830)
+++ trunk/blender/intern/opennl/superlu/get_perm_c.c 2011-12-22 20:29:44 UTC (rev 42831)
@@ -368,7 +368,7 @@
int m, n, bnz, *b_colptr, i;
int delta, maxint, nofsub, *invp;
int *b_rowind, *dhead, *qsize, *llist, *marker;
- double t, SuperLU_timer_();
+ /* double t, SuperLU_timer_(); */
/* make gcc happy */
b_rowind=NULL;
@@ -377,7 +377,7 @@
m = A->nrow;
n = A->ncol;
- t = SuperLU_timer_();
+ /* t = SuperLU_timer_(); */
switch ( ispec ) {
case 0: /* Natural ordering */
for (i = 0; i < n; ++i) perm_c[i] = i;
@@ -391,8 +391,8 @@
#if ( PRNTlevel>=1 )
printf("Use minimum degree ordering on A'*A.\n");
#endif
- t = SuperLU_timer_() - t;
- /*printf("Form A'*A time = %8.3f\n", t);*/
+ /*t = SuperLU_timer_() - t;
+ printf("Form A'*A time = %8.3f\n", t);*/
break;
case 2: /* Minimum degree ordering on A'+A */
if ( m != n ) ABORT("Matrix is not square");
@@ -401,8 +401,8 @@
#if ( PRNTlevel>=1 )
printf("Use minimum degree ordering on A'+A.\n");
#endif
- t = SuperLU_timer_() - t;
- /*printf("Form A'+A time = %8.3f\n", t);*/
+ /*t = SuperLU_timer_() - t;
+ printf("Form A'+A time = %8.3f\n", t);*/
break;
case 3: /* Approximate minimum degree column ordering. */
get_colamd(m, n, Astore->nnz, Astore->colptr, Astore->rowind,
@@ -417,7 +417,7 @@
}
if ( bnz != 0 ) {
- t = SuperLU_timer_();
+ /* t = SuperLU_timer_(); */
/* Initialize and allocate storage for GENMMD. */
delta = 1; /* DELTA is a parameter to allow the choice of nodes
@@ -452,8 +452,8 @@
SUPERLU_FREE(llist);
SUPERLU_FREE(marker);
- t = SuperLU_timer_() - t;
- /* printf("call GENMMD time = %8.3f\n", t);*/
+ /* t = SuperLU_timer_() - t;
+ printf("call GENMMD time = %8.3f\n", t);*/
} else { /* Empty adjacency structure */
for (i = 0; i < n; ++i) perm_c[i] = i;
Modified: trunk/blender/intern/opennl/superlu/scolumn_bmod.c
===================================================================
--- trunk/blender/intern/opennl/superlu/scolumn_bmod.c 2011-12-22 19:09:21 UTC (rev 42830)
+++ trunk/blender/intern/opennl/superlu/scolumn_bmod.c 2011-12-22 20:29:44 UTC (rev 42831)
@@ -303,7 +303,6 @@
d_fsupc=0 if fsupc >= fpanelc. */
d_fsupc = fst_col - fsupc;
- lptr = xlsub[fsupc] + d_fsupc;
luptr = xlusup[fst_col] + d_fsupc;
nsupr = xlsub[fsupc+1] - xlsub[fsupc]; /* Leading dimension */
nsupc = jcol - fst_col; /* Excluding jcol */
Modified: trunk/blender/intern/opennl/superlu/strsv.c
===================================================================
--- trunk/blender/intern/opennl/superlu/strsv.c 2011-12-22 19:09:21 UTC (rev 42830)
+++ trunk/blender/intern/opennl/superlu/strsv.c 2011-12-22 20:29:44 UTC (rev 42831)
@@ -9,9 +9,6 @@
{
- /* System generated locals */
- int i__1, i__2;
-
/* Local variables */
static int info;
static float temp;
@@ -213,14 +210,12 @@
}
} else {
if (*incx == 1) {
- i__1 = *n;
for (j = 1; j <= *n; ++j) {
if (X(j) != 0.f) {
if (nounit) {
X(j) /= A(j,j);
}
temp = X(j);
- i__2 = *n;
for (i = j + 1; i <= *n; ++i) {
X(i) -= temp * A(i,j);
/* L50: */
@@ -230,7 +225,6 @@
}
} else {
jx = kx;
- i__1 = *n;
for (j = 1; j <= *n; ++j) {
if (X(jx) != 0.f) {
if (nounit) {
@@ -238,7 +232,6 @@
}
temp = X(jx);
ix = jx;
- i__2 = *n;
for (i = j + 1; i <= *n; ++i) {
ix += *incx;
X(ix) -= temp * A(i,j);
@@ -256,10 +249,8 @@
if (lsame_(uplo, "U")) {
if (*incx == 1) {
- i__1 = *n;
for (j = 1; j <= *n; ++j) {
temp = X(j);
- i__2 = j - 1;
for (i = 1; i <= j-1; ++i) {
temp -= A(i,j) * X(i);
/* L90: */
@@ -272,11 +263,9 @@
}
} else {
jx = kx;
- i__1 = *n;
for (j = 1; j <= *n; ++j) {
temp = X(jx);
ix = kx;
- i__2 = j - 1;
for (i = 1; i <= j-1; ++i) {
temp -= A(i,j) * X(ix);
ix += *incx;
@@ -294,7 +283,6 @@
if (*incx == 1) {
for (j = *n; j >= 1; --j) {
temp = X(j);
- i__1 = j + 1;
for (i = *n; i >= j+1; --i) {
temp -= A(i,j) * X(i);
/* L130: */
@@ -311,7 +299,6 @@
for (j = *n; j >= 1; --j) {
temp = X(jx);
ix = kx;
- i__1 = j + 1;
for (i = *n; i >= j+1; --i) {
temp -= A(i,j) * X(ix);
ix -= *incx;
Modified: trunk/blender/intern/opennl/superlu/sutil.c
===================================================================
--- trunk/blender/intern/opennl/superlu/sutil.c 2011-12-22 19:09:21 UTC (rev 42830)
+++ trunk/blender/intern/opennl/superlu/sutil.c 2011-12-22 20:29:44 UTC (rev 42831)
@@ -370,8 +370,6 @@
sFillRHS(trans_t trans, int nrhs, float *x, int ldx,
SuperMatrix *A, SuperMatrix *B)
{
- NCformat *Astore;
- float *Aval;
DNformat *Bstore;
float *rhs;
float one = 1.0;
@@ -379,8 +377,6 @@
int ldc;
char transc[1];
- Astore = A->Store;
- Aval = (float *) Astore->nzval;
Bstore = B->Store;
rhs = Bstore->nzval;
ldc = Bstore->lda;
Modified: trunk/blender/intern/opennl/superlu/util.h
===================================================================
--- trunk/blender/intern/opennl/superlu/util.h 2011-12-22 19:09:21 UTC (rev 42830)
+++ trunk/blender/intern/opennl/superlu/util.h 2011-12-22 20:29:44 UTC (rev 42831)
@@ -24,7 +24,8 @@
#define NUM_TEMPV(m,w,t,b) ( SUPERLU_MAX(m, (t + b)*w) )
#ifndef USER_ABORT
-#define USER_ABORT(msg) superlu_abort_and_exit(msg)
+#define USER_ABORT(msg) \
+ { fprintf(stderr, "%s", msg); exit (-1); }
#endif
#define ABORT(err_msg) \
Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2011-12-22 19:09:21 UTC (rev 42830)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2011-12-22 20:29:44 UTC (rev 42831)
@@ -1704,7 +1704,7 @@
/* sort the base list on dependency order */
void DAG_scene_sort(Main *bmain, Scene *sce)
{
- DagNode *node;
+ DagNode *node, *rootnode;
DagNodeQueue *nqueue;
DagAdjList *itA;
int time;
@@ -1726,11 +1726,10 @@
time = 1;
- node = sce->theDag->DagNode.first;
-
- node->color = DAG_GRAY;
+ rootnode = sce->theDag->DagNode.first;
+ rootnode->color = DAG_GRAY;
time++;
- push_stack(nqueue,node);
+ push_stack(nqueue,rootnode);
while(nqueue->count) {
@@ -2848,11 +2847,9 @@
for(node = dag->DagNode.first; node; node= node->next)
node->color = DAG_WHITE;
- node = dag->DagNode.first;
+ rootnode->color = DAG_GRAY;
+ push_stack(nqueue, rootnode);
- node->color = DAG_GRAY;
- push_stack(nqueue, node);
-
while(nqueue->count) {
skip = 0;
Modified: trunk/blender/source/blender/blenkernel/intern/fcurve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/fcurve.c 2011-12-22 19:09:21 UTC (rev 42830)
+++ trunk/blender/source/blender/blenkernel/intern/fcurve.c 2011-12-22 20:29:44 UTC (rev 42831)
@@ -1414,10 +1414,7 @@
DRIVER_TARGETS_LOOPER_END
/* remove the variable from the driver */
- if (driver)
- BLI_freelinkN(&driver->variables, dvar);
- else
- MEM_freeN(dvar);
+ BLI_freelinkN(&driver->variables, dvar);
#ifdef WITH_PYTHON
/* since driver variables are cached, the expression needs re-compiling too */
Modified: trunk/blender/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/movieclip.c 2011-12-22 19:09:21 UTC (rev 42830)
+++ trunk/blender/source/blender/blenkernel/intern/movieclip.c 2011-12-22 20:29:44 UTC (rev 42831)
@@ -988,9 +988,9 @@
}
for(ob= bmain->object.first; ob; ob= ob->id.next) {
- bConstraint *con= ob->constraints.first;
+ bConstraint *con;
- for (con= ob->constraints.first; con; con= con->next) {
+ for(con= ob->constraints.first; con; con= con->next) {
bConstraintTypeInfo *cti= constraint_get_typeinfo(con);
if(cti->type==CONSTRAINT_TYPE_FOLLOWTRACK) {
Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2011-12-22 19:09:21 UTC (rev 42830)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2011-12-22 20:29:44 UTC (rev 42831)
@@ -2292,6 +2292,9 @@
break;
}
}
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list