From 2329b270af49114ed8b30d8dfe7c53240ba66905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <gruenich@dune-project.org>
Date: Tue, 7 Nov 2023 19:41:05 +0100
Subject: [PATCH] Prevent shadowing of some variables
Found by cppcheck
---
dune/uggrid/gm/refine.cc | 4 +--
dune/uggrid/gm/ugm.cc | 46 ++++++++++++--------------
dune/uggrid/parallel/dddif/handler.cc | 23 ++++++-------
dune/uggrid/parallel/dddif/identify.cc | 9 +++--
dune/uggrid/parallel/dddif/overlap.cc | 4 +--
5 files changed, 40 insertions(+), 46 deletions(-)
diff --git a/dune/uggrid/gm/refine.cc b/dune/uggrid/gm/refine.cc
index 77c3f045c..4cd3b258b 100644
--- a/dune/uggrid/gm/refine.cc
+++ b/dune/uggrid/gm/refine.cc
@@ -4666,7 +4666,7 @@ static int RefineElementGreen (GRID *theGrid, ELEMENT *theElement, NODE **theCon
case 2 :
{
- INT node,k;
+ INT node;
/*INT maxedge=-1;*/
#ifdef ModelP
unsigned int maxid = 0;
@@ -5127,7 +5127,7 @@ static int RefineElementGreen (GRID *theGrid, ELEMENT *theElement, NODE **theCon
/* connect sons over outer sides */
for (i=0; i<SIDES_OF_ELEM(theElement); i++)
{
- INT j,k,Sons_of_Side;
+ INT Sons_of_Side;
ELEMENT *Sons_of_Side_List[MAX_SONS];
INT SonSides[MAX_SIDE_NODES];
diff --git a/dune/uggrid/gm/ugm.cc b/dune/uggrid/gm/ugm.cc
index 2cab49686..673cf87cd 100644
--- a/dune/uggrid/gm/ugm.cc
+++ b/dune/uggrid/gm/ugm.cc
@@ -3151,7 +3151,7 @@ static INT DisposeVertex (GRID *theGrid, VERTEX *theVertex)
INT NS_DIM_PREFIX DisposeElement (GRID *theGrid, ELEMENT *theElement)
{
- INT i,j,tag;
+ INT j,tag;
NODE *theNode;
VERTEX *theVertex;
EDGE *theEdge;
@@ -3224,12 +3224,11 @@ INT NS_DIM_PREFIX DisposeElement (GRID *theGrid, ELEMENT *theElement)
/* they lost their father pointers */
if (NSONS(theElement)>0)
{
- INT i,j;
ELEMENT *SonList[MAX_SONS];
if (GetAllSons(theElement,SonList)) RETURN(GM_FATAL);
- i = 0;
+ INT i = 0;
while (SonList[i] != NULL)
{
PRINTDEBUG(gm,2,(PFMT "DisposeElement(): elem=" EID_FMTX
@@ -3256,7 +3255,7 @@ INT NS_DIM_PREFIX DisposeElement (GRID *theGrid, ELEMENT *theElement)
/* remove element sides if it's a boundary element */
if (OBJT(theElement)==BEOBJ)
- for (i=0; i<SIDES_OF_ELEM(theElement); i++)
+ for (INT i = 0; i < SIDES_OF_ELEM(theElement); i++)
{
bnds = ELEM_BNDS(theElement,i);
if (bnds != NULL)
@@ -3382,7 +3381,7 @@ INT NS_DIM_PREFIX DisposeElement (GRID *theGrid, ELEMENT *theElement)
}
/* reset neighbor pointers referencing element and dispose vectors in sides if */
- for (i=0; i<SIDES_OF_ELEM(theElement); i++)
+ for (INT i = 0; i < SIDES_OF_ELEM(theElement); i++)
{
ELEMENT *theNeighbor = NBELEM(theElement,i);
@@ -4495,7 +4494,6 @@ ELEMENT * NS_DIM_PREFIX InsertElement (GRID *theGrid, INT n, NODE **Node, ELEMEN
INT NS_DIM_PREFIX DeleteElement (MULTIGRID *theMG, ELEMENT *theElement) /* 3D VERSION */
{
GRID *theGrid;
- ELEMENT *theNeighbor;
INT i,j,found;
/* check level */
@@ -4510,7 +4508,7 @@ INT NS_DIM_PREFIX DeleteElement (MULTIGRID *theMG, ELEMENT *theElement) /* 3D VE
/* delete pointers in neighbors */
for (i=0; i<SIDES_OF_ELEM(theElement); i++)
{
- theNeighbor = NBELEM(theElement,i);
+ ELEMENT *theNeighbor = NBELEM(theElement,i);
if (theNeighbor!=NULL)
{
found = 0;
@@ -4549,7 +4547,7 @@ INT NS_DIM_PREFIX InsertMesh (MULTIGRID *theMG, MESH *theMesh)
{
GRID *theGrid;
ELEMENT *theElement;
- NODE **NList,*Nodes[MAX_CORNERS_OF_ELEM],*ListNode;
+ NODE **NList,*Nodes[MAX_CORNERS_OF_ELEM];
VERTEX **VList;
INT i,k,n,nv,j,maxlevel,l,move;
INT ElemSideOnBnd[MAX_SIDES_OF_ELEM];
@@ -4631,25 +4629,25 @@ INT NS_DIM_PREFIX InsertMesh (MULTIGRID *theMG, MESH *theMesh)
n = theMesh->Element_corners[j][k];
for (l=0; l<n; l++)
{
- ListNode = NList[theMesh->Element_corner_ids[j][k][l]];
- if (ListNode==NULL || LEVEL(ListNode)<i)
+ NODE *curListNode = NList[theMesh->Element_corner_ids[j][k][l]];
+ if (curListNode == NULL || LEVEL(curListNode) < i)
{
Nodes[l] = CreateNode(theGrid,VList[theMesh->Element_corner_ids[j][k][l]],NULL,LEVEL_0_NODE,0);
if (Nodes[l]==NULL) assert(0);
NList[theMesh->Element_corner_ids[j][k][l]] = Nodes[l];
- if (ListNode==NULL || LEVEL(ListNode)<i-1)
+ if (curListNode == NULL || LEVEL(curListNode) < i-1)
{
SETNFATHER(Nodes[l],NULL);
}
else
{
- SETNFATHER(Nodes[l],(GEOM_OBJECT *)ListNode);
- SONNODE(ListNode) = Nodes[l];
+ SETNFATHER(Nodes[l],(GEOM_OBJECT *)curListNode);
+ SONNODE(curListNode) = Nodes[l];
}
}
else
{
- Nodes[l] = ListNode;
+ Nodes[l] = curListNode;
}
}
if (theMesh->ElemSideOnBnd==NULL)
@@ -6411,7 +6409,7 @@ static INT FinishGrid (MULTIGRID *mg)
INT MarkKey = MG_MARK_KEY(mg);
INT i,side,id,nbid,found,s_id;
INT *sd_table;
- void *buffer;
+ void *fifoBuffer;
/* prepare */
if (TOPLEVEL(mg)<0)
@@ -6433,14 +6431,14 @@ static INT FinishGrid (MULTIGRID *mg)
REP_ERR_RETURN (GM_ERROR);
/* init two fifos */
- buffer=(void *)GetTmpMem(heap,sizeof(ELEMENT*)*NT(grid),MarkKey);
- if (buffer==NULL)
+ fifoBuffer = (void *)GetTmpMem(heap, sizeof(ELEMENT*)*NT(grid), MarkKey);
+ if (fifoBuffer == NULL)
REP_ERR_RETURN (GM_ERROR);
- fifo_init(&unused,buffer,sizeof(ELEMENT*)*NT(grid));
- buffer=(void *)GetTmpMem(heap,sizeof(ELEMENT*)*NT(grid),MarkKey);
- if (buffer==NULL)
+ fifo_init(&unused, fifoBuffer, sizeof(ELEMENT*)*NT(grid));
+ fifoBuffer = (void *)GetTmpMem(heap, sizeof(ELEMENT*)*NT(grid), MarkKey);
+ if (fifoBuffer == NULL)
REP_ERR_RETURN (GM_ERROR);
- fifo_init(&shell,buffer,sizeof(ELEMENT*)*NT(grid));
+ fifo_init(&shell, fifoBuffer, sizeof(ELEMENT*)*NT(grid));
/* outermost loop handles nonconnected domains */
while (true)
@@ -6677,7 +6675,7 @@ INT NS_DIM_PREFIX SetSubdomainIDfromBndInfo (MULTIGRID *theMG)
GRID *theGrid;
ELEMENT *theElement, *theNeighbor;
NODE *theNode;
- void *buffer;
+ void *fifoBuffer;
INT i,n,id,nbid,j;
FIFO myfifo;
INT MarkKey = MG_MARK_KEY(theMG);
@@ -6689,8 +6687,8 @@ INT NS_DIM_PREFIX SetSubdomainIDfromBndInfo (MULTIGRID *theMG)
/* allocate fifo and init */
theHeap = MYMG(theGrid)->theHeap;
- buffer=(void *)GetTmpMem(theHeap,sizeof(ELEMENT*)*n,MarkKey);
- fifo_init(&myfifo,buffer,sizeof(ELEMENT*)*n);
+ fifoBuffer = (void *)GetTmpMem(theHeap, sizeof(ELEMENT*)*n, MarkKey);
+ fifo_init(&myfifo, fifoBuffer, sizeof(ELEMENT*)*n);
for (theElement=PFIRSTELEMENT(theGrid); theElement!=NULL;
theElement=SUCCE(theElement))
SETUSED(theElement,0);
diff --git a/dune/uggrid/parallel/dddif/handler.cc b/dune/uggrid/parallel/dddif/handler.cc
index 89e79efea..5605aa8a8 100644
--- a/dune/uggrid/parallel/dddif/handler.cc
+++ b/dune/uggrid/parallel/dddif/handler.cc
@@ -854,9 +854,7 @@ static void ElementXferCopy (DDD::DDDContext& context, DDD_OBJ obj, DDD_PROC pro
auto& dddctrl = ddd_ctrl(context);
INT i,nsides;
- INT Size;
ELEMENT *pe = (ELEMENT *)obj;
- VECTOR *vec;
NODE *node;
BNDS *bnds[MAX_SIDES_OF_ELEM];
@@ -936,10 +934,10 @@ static void ElementXferCopy (DDD::DDDContext& context, DDD_OBJ obj, DDD_PROC pro
/* copy element vector */
if (ddd_ctrl(context).elemData)
{
- vec = EVECTOR(pe);
+ VECTOR *vec = EVECTOR(pe);
if (vec != NULL) {
- Size = sizeof(VECTOR)-sizeof(DOUBLE) + FMT_S_VEC_TP;
+ INT Size = sizeof(VECTOR)-sizeof(DOUBLE) + FMT_S_VEC_TP;
PRINTDEBUG(dddif,2,(PFMT " ElementXferCopy(): e=" EID_FMTX
" ELEMVEC=" VINDEX_FMTX " size=%d\n",
@@ -955,10 +953,10 @@ static void ElementXferCopy (DDD::DDDContext& context, DDD_OBJ obj, DDD_PROC pro
{
for (i=0; i<SIDES_OF_ELEM(pe); i++)
{
- vec = SVECTOR(pe,i);
+ VECTOR *vec = SVECTOR(pe,i);
if (vec != NULL) {
- Size = sizeof(VECTOR)-sizeof(DOUBLE) + FMT_S_VEC_TP;
+ INT Size = sizeof(VECTOR)-sizeof(DOUBLE) + FMT_S_VEC_TP;
PRINTDEBUG(dddif,2,(PFMT " ElementXferCopy(): e=" EID_FMTX
" SIDEVEC=" VINDEX_FMTX " size=%d\n",
@@ -1244,7 +1242,6 @@ static void ElemScatterB (DDD::DDDContext& context, DDD_OBJ obj, int cnt, DDD_TY
static void ElementObjMkCons (DDD::DDDContext& context, DDD_OBJ obj, int newness)
{
- INT i,j;
INT lostson = 0;
ELEMENT *pe = (ELEMENT *)obj;
ELEMENT *succe = SUCCE(pe);
@@ -1265,12 +1262,13 @@ static void ElementObjMkCons (DDD::DDDContext& context, DDD_OBJ obj, int newness
/* correct nb relationships between ghostelements */
if (EGHOST(pe))
{
- for (i=0; i<SIDES_OF_ELEM(pe); i++)
+ for (INT i = 0; i < SIDES_OF_ELEM(pe); i++)
{
NbElement = NBELEM(pe,i);
if (NbElement!=NULL && EGHOST(NbElement))
{
- for (j=0; j<SIDES_OF_ELEM(NbElement); j++)
+ INT j = 0;
+ for (j = 0; j < SIDES_OF_ELEM(NbElement); j++)
if (NBELEM(NbElement,j) == pe) break;
/* no backptr reset nb pointer */
if (j >= SIDES_OF_ELEM(NbElement)) SET_NBELEM(pe,i,NULL);
@@ -1283,7 +1281,7 @@ static void ElementObjMkCons (DDD::DDDContext& context, DDD_OBJ obj, int newness
#ifdef UG_DIM_3
if (ddd_ctrl(context).sideData)
- for (i=0; i<SIDES_OF_ELEM(pe); i++) {
+ for (INT i = 0; i < SIDES_OF_ELEM(pe); i++) {
VOBJECT(SVECTOR(pe,i)) = (GEOM_OBJECT*)pe;
SETVECTORSIDE(SVECTOR(pe,i), i);
}
@@ -1309,11 +1307,10 @@ static void ElementObjMkCons (DDD::DDDContext& context, DDD_OBJ obj, int newness
else if (theFather != NULL)
{
ELEMENT *SonList[MAX_SONS];
- int i;
/* check whether NSONS of father must be incremented */
if (GetAllSons(theFather,SonList)) ASSERT(0);
- i = 0;
+ int i = 0;
while (SonList[i] != NULL)
{
if (SonList[i] == pe) return;
@@ -1396,7 +1393,7 @@ static void ElementObjMkCons (DDD::DDDContext& context, DDD_OBJ obj, int newness
/* update element count of edges for new created elements */
if (newness == XFER_NEW)
/* increment elem counter in edges */
- for (i=0; i<EDGES_OF_ELEM(pe); i++)
+ for (INT i = 0; i < EDGES_OF_ELEM(pe); i++)
{
EDGE *theEdge;
NODE *theNode0 = CORNER(pe,CORNER_OF_EDGE(pe,i,0));
diff --git a/dune/uggrid/parallel/dddif/identify.cc b/dune/uggrid/parallel/dddif/identify.cc
index aad316ca9..71961eccd 100644
--- a/dune/uggrid/parallel/dddif/identify.cc
+++ b/dune/uggrid/parallel/dddif/identify.cc
@@ -915,7 +915,7 @@ static INT IdentifyEdge (GRID *theGrid,
static INT IdentifyObjectsOfElementSide(GRID *theGrid, ELEMENT *theElement,
INT i, ELEMENT *theNeighbor)
{
- INT nodes, j;
+ INT nodes;
#ifdef Debug
INT n = 0;
#endif
@@ -930,7 +930,7 @@ static INT IdentifyObjectsOfElementSide(GRID *theGrid, ELEMENT *theElement,
"ncorners=%d nodes=%d\n",me,ncorners,nodes));
/* identify nodes, vertices and node vectors of son elements */
- for (j=0; j<MAX_SIDE_NODES; j++)
+ for (INT j = 0; j < MAX_SIDE_NODES; j++)
{
theNode = SideNodes[j];
if (theNode == NULL) continue;
@@ -948,7 +948,6 @@ static INT IdentifyObjectsOfElementSide(GRID *theGrid, ELEMENT *theElement,
{
ELEMENT *SonList[MAX_SONS];
INT SonsOfSide,SonSides[MAX_SONS];
- INT j;
PRINTDEBUG(dddif,1,("%d: IdentifyObjectsOfElementSide(): identify "
"EDGES and VECTORS\n",me));
@@ -957,8 +956,8 @@ static INT IdentifyObjectsOfElementSide(GRID *theGrid, ELEMENT *theElement,
SonList,SonSides,1,0)!=GM_OK)
RETURN(GM_FATAL);
- for (j=0; j<SonsOfSide; j++) {
-
+ for (INT j = 0; j < SonsOfSide; j++)
+ {
if (/*VEC_DEF_IN_OBJ_OF_GRID(theGrid,EDGEVEC) ||*/ DIM==3)
{
INT edgeofside;
diff --git a/dune/uggrid/parallel/dddif/overlap.cc b/dune/uggrid/parallel/dddif/overlap.cc
index 9b5e7ece6..54392e5ce 100644
--- a/dune/uggrid/parallel/dddif/overlap.cc
+++ b/dune/uggrid/parallel/dddif/overlap.cc
@@ -194,9 +194,9 @@ static INT UpdateElementOverlap (DDD::DDDContext& context, ELEMENT *theElement)
/* send son to all elements where theNeighbor is master, vghost or vhghost */
if (0)
{
- for (auto&& [proc, prio] : DDD_InfoProcListRange(context, PARHDRE(theNeighbor), false))
+ for (auto&& [proc, currentPrio] : DDD_InfoProcListRange(context, PARHDRE(theNeighbor), false))
{
- if (!EHGHOSTPRIO(prio))
+ if (!EHGHOSTPRIO(currentPrio))
{
XFERECOPYX(context, theSon,proc,PrioHGhost,
(OBJT(theSon)==BEOBJ) ? BND_SIZE_TAG(TAG(theSon)) :
--
GitLab