Adding casts to varargs in diagnostic output

Copied from Perforce
 Change: 178092
 ServerID: perforce.ravenbrook.com

1 files changed, 10 insertions, 10 deletions

diff --git a/mps/code/trace.c b/mps/code/trace.c
index e553d160318..6e8c8b262b0 100644
--- a/mps/code/trace.c
+++ b/mps/code/trace.c
@@ -309,7 +309,7 @@ static void traceSetSignalEmergency(TraceSet ts, Arena arena)
   Trace trace;
 
   DIAG_SINGLEF(( "traceSetSignalEmergency",
-    "traceSet: $B", ts, NULL ));
+    "traceSet: $B", (WriteFB)ts, NULL ));
 
   TRACE_SET_ITER(ti, trace, ts, arena)
     trace->emergency = TRUE;
@@ -1527,20 +1527,20 @@ static void TraceStartGenDesc_diag(GenDesc desc, int i)
       NULL ));
   } else {
     DIAG_WRITEF(( DIAG_STREAM,
-      "         GenDesc [$U]", i,
+      "         GenDesc [$U]", (WriteFU)i,
       NULL ));
   }
   DIAG_WRITEF(( DIAG_STREAM,
     " $P capacity: $U KiB, mortality $D\n",
-    (void *)desc, desc->capacity, desc->mortality,
-    "         ZoneSet:$B\n", desc->zones,
+    (WriteFP)desc, (WriteFU)desc->capacity, (WriteFD)desc->mortality,
+    "         ZoneSet:$B\n", (WriteFB)desc->zones,
     NULL ));
   RING_FOR(n, &desc->locusRing, nn) {
     DIAG_DECL( PoolGen gen = RING_ELT(PoolGen, genRing, n); )
     DIAG_WRITEF(( DIAG_STREAM,
-      "           PoolGen $U ($S)", gen->nr, gen->pool->class->name,
-      " totalSize $U", gen->totalSize,
-      " newSize $U\n", gen->newSizeAtCreate,
+      "           PoolGen $U ($S)", (WriteFU)gen->nr, (WriteFS)gen->pool->class->name,
+      " totalSize $U", (WriteFU)gen->totalSize,
+      " newSize $U\n", (WriteFU)gen->newSizeAtCreate,
       NULL ));
   }
 }
@@ -1606,14 +1606,14 @@ void TraceStart(Trace trace, double mortality, double finishingTime)
 
   DIAG_FIRSTF(( "TraceStart",
     "because code $U: $S\n",
-    trace->why, TraceStartWhyToString(trace->why),
+    (WriteFU)trace->why, (WriteFS)TraceStartWhyToString(trace->why),
     NULL ));
 
   DIAG( ArenaDescribe(arena, DIAG_STREAM); );
 
   DIAG_MOREF((
     "       white set:$B\n",
-    trace->white,
+    (WriteFB)trace->white,
     NULL ));
 
   {
@@ -1626,7 +1626,7 @@ void TraceStart(Trace trace, double mortality, double finishingTime)
     RING_FOR(node, &arena->chainRing, nextNode) {
       Chain chain = RING_ELT(Chain, chainRing, node);
       DIAG_WRITEF(( DIAG_STREAM,
-        "       Chain $P\n", (void *)chain,
+        "       Chain $P\n", (WriteFP)chain,
         NULL ));
 
       for(i = 0; i < chain->genCount; ++i) {