From c12dc677bc43d525d6c8aeba3f5cf0d27bcb9842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <gruenich@dune-project.org>
Date: Mon, 23 Sep 2019 23:50:55 +0200
Subject: [PATCH] [cleanup] Fix Wformat warnings by casting to (void*)
---
gm/dlmgr.t | 27 ++++++++++++++-------------
parallel/dddif/debugger.cc | 4 ++--
parallel/dddif/overlap.cc | 2 +-
3 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/gm/dlmgr.t b/gm/dlmgr.t
index 258daa0be..072a37224 100644
--- a/gm/dlmgr.t
+++ b/gm/dlmgr.t
@@ -255,7 +255,7 @@ LINK(OTYPE)
IFDEBUG(gm,2)
printf("GRID_LINK_" STR(OTYPE) "():" STR(OTYPE)
- " has listpart=%d for prio=%d obj=%p\n",listpart,Prio,Object);
+ " has listpart=%d for prio=%d obj=%p\n", listpart, Prio, (void*) Object);
fflush(stdout);
ENDDEBUG
@@ -437,7 +437,8 @@ LINKX(OTYPE)
{
IFDEBUG(gm,2)
printf(" GRID_LINKX_" STR(OTYPE) "():" STR(OTYPE)
- " calling GRID_LINK_" STR(OTYPE) "(): Object=%p After=%p \n",Object,After);
+ " calling GRID_LINK_" STR(OTYPE) "(): Object=%p After=%p \n",
+ (void*) Object, (void*) After);
ENDDEBUG
CAT(GRID_LINK_,OTYPE) (Grid,Object,Prio);
@@ -460,7 +461,7 @@ LINKX(OTYPE)
IFDEBUG(gm,2)
printf("GRID_LINKX_" STR(OTYPE) "():" STR(OTYPE)
- " has listpart=%d for prio=%d obj=%p\n",listpart,Prio,Object);
+ " has listpart=%d for prio=%d obj=%p\n", listpart, Prio, (void*) Object);
fflush(stdout);
ENDDEBUG
@@ -600,20 +601,20 @@ PRINT_LIST(OTYPE)
if (prios==2)
{
printf (" fg=%p fg=%p fm=%p lm=%p\n",
- CAT(LISTPART_FIRST,OTYPE(Grid,0)),
- CAT(LISTPART_LAST,OTYPE(Grid,0)),
- CAT(LISTPART_FIRST,OTYPE(Grid,1)),
- CAT(LISTPART_LAST,OTYPE(Grid,1)));
+ (void*) CAT(LISTPART_FIRST,OTYPE(Grid,0)),
+ (void*) CAT(LISTPART_LAST,OTYPE(Grid,0)),
+ (void*) CAT(LISTPART_FIRST,OTYPE(Grid,1)),
+ (void*) CAT(LISTPART_LAST,OTYPE(Grid,1)));
}
else
{
printf (" fg=%p fg=%p fb=%p lb=%p fm=%p lm=%p\n",
- CAT(LISTPART_FIRST,OTYPE(Grid,0)),
- CAT(LISTPART_LAST,OTYPE(Grid,0)),
- CAT(LISTPART_FIRST,OTYPE(Grid,1)),
- CAT(LISTPART_LAST,OTYPE(Grid,1)),
- CAT(LISTPART_FIRST,OTYPE(Grid,2)),
- CAT(LISTPART_LAST,OTYPE(Grid,2)));
+ (void*) CAT(LISTPART_FIRST,OTYPE(Grid,0)),
+ (void*) CAT(LISTPART_LAST,OTYPE(Grid,0)),
+ (void*) CAT(LISTPART_FIRST,OTYPE(Grid,1)),
+ (void*) CAT(LISTPART_LAST,OTYPE(Grid,1)),
+ (void*) CAT(LISTPART_FIRST,OTYPE(Grid,2)),
+ (void*) CAT(LISTPART_LAST,OTYPE(Grid,2)));
}
}
diff --git a/parallel/dddif/debugger.cc b/parallel/dddif/debugger.cc
index 1667e5002..1e3705159 100644
--- a/parallel/dddif/debugger.cc
+++ b/parallel/dddif/debugger.cc
@@ -361,7 +361,7 @@ static void buggy_Search (MULTIGRID *theMG, DDD_GID gid)
if (DDD_InfoGlobalId(PARHDRE(e))==gid)
{
printf("ELEMENT gid=" DDD_GID_FMT ", adr=%p, level=%d\n",
- gid, e, level);
+ gid, (void*) e, level);
buggy_ShowCopies(context, PARHDRE(e));
buggy_ElemShow(e);
found = true;
@@ -375,7 +375,7 @@ static void buggy_Search (MULTIGRID *theMG, DDD_GID gid)
if (DDD_InfoGlobalId(PARHDR(n))==gid)
{
printf("NODE gid=" DDD_GID_FMT ", adr=%p, level=%d\n",
- gid, n, level);
+ gid, (void*) n, level);
buggy_ShowCopies(context, PARHDR(n));
buggy_NodeShow(n);
found = true;
diff --git a/parallel/dddif/overlap.cc b/parallel/dddif/overlap.cc
index 1da32113a..f82fdc861 100644
--- a/parallel/dddif/overlap.cc
+++ b/parallel/dddif/overlap.cc
@@ -730,7 +730,7 @@ static INT ConnectOverlapVerticalGrid (GRID *theGrid)
printf("ConnectOverlapVerticalGrid(): new "
" midnode relation between theEdge=%08p"
" SonNode=" ID_FMTX "Vertex=" VID_FMTX "\n",
- theEdge,ID_PRTX(SonNode),
+ (void*) theEdge,ID_PRTX(SonNode),
VID_PRTX(MYVERTEX(SonNode)));
ENDDEBUG
#endif
--
GitLab