Minor code cleanliness issues caught by gcc-4.6

jedbrown · Apr 22, 2011 · 8b3990c · 8b3990c
1 parent d734db5
commit 8b3990c
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 15 deletions.
diff --git a/src/fs/interface/fsrulesetit.c b/src/fs/interface/fsrulesetit.c
@@ -688,7 +688,6 @@ dErr dRulesetIteratorRestorePatchAssembly(dRulesetIterator it,dInt *P,const dInt
   va_list ap;
   dInt i;
   struct dRulesetIteratorLink *p;
-  const dReal *cjinv = NULL;
 
   dFunctionBegin;
   va_start(ap,deriv);
@@ -719,7 +718,6 @@ dErr dRulesetIteratorRestorePatchAssembly(dRulesetIterator it,dInt *P,const dInt
       if (rowcol) *rowcol = NULL;
       if (interp) *interp = NULL;
       if (deriv)  *deriv  = NULL;
-      cjinv = it->cjinv_elem;
     }
   }
   va_end(ap);

diff --git a/src/fs/mesh/interface/mesh.c b/src/fs/mesh/interface/mesh.c
@@ -924,13 +924,11 @@ dErr dMeshLoad(dMesh mesh)
 dErr dMeshView(dMesh m,PetscViewer viewer)
 {
   const char *type;
-  iMesh_Instance mi;
   dBool iascii;
   dErr err;
 
   dFunctionBegin;
   PetscValidHeaderSpecific(m,dMESH_CLASSID,1);
-  mi = m->mi;
   if (!viewer) {
     err = PetscViewerASCIIGetStdout(((PetscObject)m)->comm,&viewer);dCHK(err);
   }

diff --git a/src/fs/tests/elast.c b/src/fs/tests/elast.c
@@ -491,7 +491,6 @@ int main(int argc,char *argv[])
   Elast elt;
   dFS fs;
   MPI_Comm comm;
-  PetscViewer viewer;
   Mat J,Jp;
   Vec r,x,soln;
   SNES snes;
@@ -500,7 +499,6 @@ int main(int argc,char *argv[])
 
   err = dInitialize(&argc,&argv,NULL,help);dCHK(err);
   comm = PETSC_COMM_WORLD;
-  viewer = PETSC_VIEWER_STDOUT_WORLD;
   err = PetscLogEventRegister("ElastShellMult",MAT_CLASSID,&LOG_ElastShellMult);dCHK(err);
 
   err = ElastCreate(comm,&elt);dCHK(err);

diff --git a/src/fs/tests/stokes.c b/src/fs/tests/stokes.c
@@ -652,8 +652,7 @@ static dErr StokesJacobianAssemble_Velocity(Stokes stk,Mat Ap,Vec Mdiag,Vec gx)
         StokesPointwiseComputeStore(&stk->rheo,x[q],du[q],&store);
         for (dInt j=0; j<P; j++) { /* trial functions */
           for (dInt fj=0; fj<3; fj++) {
-            dScalar uu[3] = {0},duu[3][3] = {{0},{0},{0}},dv[3][3],Dusym[6],Dvsym[6],q_unused;
-            uu[fj] = interp[q][j];
+            dScalar duu[3][3] = {{0},{0},{0}},dv[3][3],Dusym[6],Dvsym[6],q_unused;
             duu[fj][0] = deriv[q][j][0];
             duu[fj][1] = deriv[q][j][1];
             duu[fj][2] = deriv[q][j][2];
@@ -981,7 +980,6 @@ int main(int argc,char *argv[])
 {
   Stokes stk;
   MPI_Comm comm;
-  PetscViewer viewer;
   Mat J,Jp;
   MatFDColoring fdcolor = NULL;
   Vec r,x,soln;
@@ -991,7 +989,6 @@ int main(int argc,char *argv[])
 
   err = dInitialize(&argc,&argv,NULL,help);dCHK(err);
   comm = PETSC_COMM_WORLD;
-  viewer = PETSC_VIEWER_STDOUT_WORLD;
   err = PetscLogEventRegister("StokesShellMult",MAT_CLASSID,&LOG_StokesShellMult);dCHK(err);
 
   err = StokesCreate(comm,&stk);dCHK(err);

diff --git a/src/jacobi/interface/jacobi.c b/src/jacobi/interface/jacobi.c
@@ -467,7 +467,7 @@ dErr dEFSGetTensorNodes(dEFS efs,dInt *dim,dInt *tsize,dReal *nodes[],dReal *wei
 
   dFunctionBegin;
   dValidPointer(efs,1);
-  err = (*efs->ops.getTensorNodes)(efs,dim,tsize,nodes,weight,mscale,lscale);
+  err = (*efs->ops.getTensorNodes)(efs,dim,tsize,nodes,weight,mscale,lscale);dCHK(err);
   dFunctionReturn(0);
 }
 

diff --git a/src/jacobi/tests/ex1.c b/src/jacobi/tests/ex1.c
@@ -319,13 +319,11 @@ int main(int argc,char *argv[])
 {
   dJacobi jac;
   MPI_Comm comm;
-  PetscViewer viewer;
   dInt ex;
   dErr err;
 
   err = dInitialize(&argc,&argv,0,help);dCHK(err);
   comm = PETSC_COMM_WORLD;
-  viewer = PETSC_VIEWER_STDOUT_WORLD;
 
   ex = 0;
   err = PetscOptionsBegin(comm,NULL,"Jacobi ex1 test driver options",NULL);dCHK(err);

diff --git a/src/tools/dohpblock.c b/src/tools/dohpblock.c
@@ -106,15 +106,15 @@ static dErr doGlobalID(iMesh_Instance mesh)
   MeshListEH ents=MLZ;
   MeshListInt type=MLZ;
   int count[4] = {0,0,0,0};
-  int owned,offset,*number;
+  int owned,*number;
   dMeshTag idTag;
   dErr err;
 
   dFunctionBegin;
   iMesh_getEntities(mesh,0,iBase_ALL_TYPES,iMesh_ALL_TOPOLOGIES,MLREF(ents),&err);dICHK(mesh,err);
   iMesh_getEntArrType(mesh,ents.v,ents.s,MLREF(type),&err);dICHK(mesh,err);
   err = dMalloc(ents.s*sizeof(number[0]),&number);dCHK(err);
-  owned = ents.s; offset = 0;
+  owned = ents.s;
   for (int i=0; i<owned; i++) {
     number[i] = count[type.v[i]]++;
   }