Consistently passing closure sizes as size_t and not casting back and forth to size or anything else.

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

5 files changed, 8 insertions, 8 deletions

diff --git a/mps/code/mpm.h b/mps/code/mpm.h
index 371319aeee6..62dac8a381b 100644
--- a/mps/code/mpm.h
+++ b/mps/code/mpm.h
@@ -213,7 +213,7 @@ extern void PoolFixEmergency(Pool pool, ScanState ss, Seg seg, Addr *refIO);
 extern void PoolReclaim(Pool pool, Trace trace, Seg seg);
 extern void PoolTraceEnd(Pool pool, Trace trace);
 extern void PoolWalk(Pool pool, Seg seg, FormattedObjectsStepMethod f,
-                     void *v, unsigned long s);
+                     void *v, size_t s);
 extern void PoolFreeWalk(Pool pool, FreeBlockStepMethod f, void *p);
 extern Res PoolTrivInit(Pool pool, va_list arg);
 extern void PoolTrivFinish(Pool pool);
@@ -262,7 +262,7 @@ extern Res PoolNoFramePop(Pool pool, Buffer buf, AllocFrame frame);
 extern Res PoolTrivFramePop(Pool pool, Buffer buf, AllocFrame frame);
 extern void PoolNoFramePopPending(Pool pool, Buffer buf, AllocFrame frame);
 extern void PoolNoWalk(Pool pool, Seg seg, FormattedObjectsStepMethod step,
-                       void *p, unsigned long s);
+                       void *p, size_t s);
 extern void PoolNoFreeWalk(Pool pool, FreeBlockStepMethod f, void *p);
 extern PoolDebugMixin PoolNoDebugMixin(Pool pool);
 extern BufferClass PoolNoBufferClass(void);
diff --git a/mps/code/mpmtypes.h b/mps/code/mpmtypes.h
index b424cb6d341..d1aaa1e4cf2 100644
--- a/mps/code/mpmtypes.h
+++ b/mps/code/mpmtypes.h
@@ -211,7 +211,7 @@ typedef void (*PoolFramePopPendingMethod)(Pool pool, Buffer buf,
                                           AllocFrame frame);
 typedef void (*PoolWalkMethod)(Pool pool, Seg seg,
                                FormattedObjectsStepMethod f,
-                               void *v, unsigned long s);
+                               void *v, size_t s);
 typedef void (*PoolFreeWalkMethod)(Pool pool, FreeBlockStepMethod f, void *p);
 typedef BufferClass (*PoolBufferClassMethod)(void);
 typedef Res (*PoolDescribeMethod)(Pool pool, mps_lib_FILE *stream);
diff --git a/mps/code/pool.c b/mps/code/pool.c
index 509c5a52552..e2578cf3497 100644
--- a/mps/code/pool.c
+++ b/mps/code/pool.c
@@ -482,7 +482,7 @@ void PoolTraceEnd(Pool pool, Trace trace)
 /* PoolWalk -- walk objects in this segment */
 
 void PoolWalk(Pool pool, Seg seg, FormattedObjectsStepMethod f,
-              void *p, Size s)
+              void *p, size_t s)
 {
   AVERT(Pool, pool);
   AVERT(Seg, seg);
diff --git a/mps/code/poolabs.c b/mps/code/poolabs.c
index 324975cb7c0..80b7f5323be 100644
--- a/mps/code/poolabs.c
+++ b/mps/code/poolabs.c
@@ -621,7 +621,7 @@ Res PoolTrivFramePop(Pool pool, Buffer buf, AllocFrame frame)
 
 
 void PoolNoWalk(Pool pool, Seg seg,
-                FormattedObjectsStepMethod f, void *p, Size s)
+                FormattedObjectsStepMethod f, void *p, size_t s)
 {
   AVERT(Pool, pool);
   AVERT(Seg, seg);
diff --git a/mps/code/walk.c b/mps/code/walk.c
index 6ea698de217..bb81a7aa152 100644
--- a/mps/code/walk.c
+++ b/mps/code/walk.c
@@ -36,7 +36,7 @@ static Bool FormattedObjectsStepClosureCheck(FormattedObjectsStepClosure c)
 
 
 static void ArenaFormattedObjectsStep(Addr object, Format format, Pool pool,
-                                      void *p, Size s)
+                                      void *p, size_t s)
 {
   FormattedObjectsStepClosure c;
   /* Can't check object */
@@ -56,7 +56,7 @@ static void ArenaFormattedObjectsStep(Addr object, Format format, Pool pool,
  * So called because it walks all formatted objects in an arena.  */
 
 static void ArenaFormattedObjectsWalk(Arena arena, FormattedObjectsStepMethod f,
-                                      void *p, Size s)
+                                      void *p, size_t s)
 {
   Seg seg;
   FormattedObjectsStepClosure c;
@@ -186,7 +186,7 @@ static Bool rootsStepClosureCheck(rootsStepClosure rsc)
 static void rootsStepClosureInit(rootsStepClosure rsc,
                                  Globals arena, Trace trace,
                                  TraceFixMethod rootFix,
-                                 mps_roots_stepper_t f, void *p, Size s)
+                                 mps_roots_stepper_t f, void *p, size_t s)
 {
   ScanState ss;