From bb02f55b62ea785cb64bc60bebca8721dd52d886 Mon Sep 17 00:00:00 2001
From: Richard Brooksby <rb@ravenbrook.com>
Date: Thu, 16 May 2013 03:12:11 +0100
Subject: [PATCH] Making clear the size of the array of args passed to varargs
 conversion methods.

Copied from Perforce
 Change: 181845
 ServerID: perforce.ravenbrook.com
---
 mps/code/arena.c    | 2 +-
 mps/code/arenacl.c  | 2 +-
 mps/code/arenavm.c  | 2 +-
 mps/code/buffer.c   | 4 ++--
 mps/code/mpm.h      | 2 +-
 mps/code/poolabs.c  | 2 +-
 mps/code/poolamc.c  | 2 +-
 mps/code/poolams.c  | 4 ++--
 mps/code/poolawl.c  | 2 +-
 mps/code/poollo.c   | 2 +-
 mps/code/poolmfs.c  | 2 +-
 mps/code/poolmv.c   | 4 ++--
 mps/code/poolmv2.c  | 4 ++--
 mps/code/poolmvff.c | 4 ++--
 14 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/mps/code/arena.c b/mps/code/arena.c
index 8b8a0ccab13..189503b348e 100644
--- a/mps/code/arena.c
+++ b/mps/code/arena.c
@@ -48,7 +48,7 @@ static Res ArenaTrivDescribe(Arena arena, mps_lib_FILE *stream)
 
 /* ArenaTrivVarargs -- ignore obsolete varargs for future arena classes */
 
-static void ArenaTrivVarargs(ArgStruct args[], va_list varargs)
+static void ArenaTrivVarargs(ArgStruct args[MPS_ARGS_MAX], va_list varargs)
 {
   UNUSED(varargs);
   args[0].key = MPS_KEY_ARGS_END;
diff --git a/mps/code/arenacl.c b/mps/code/arenacl.c
index a9af0c4d7bc..57918755b77 100644
--- a/mps/code/arenacl.c
+++ b/mps/code/arenacl.c
@@ -181,7 +181,7 @@ static void ClientChunkFinish(Chunk chunk)
 
 /* ClientArenaVarargs -- parse obsolete varargs */
 
-static void ClientArenaVarargs(ArgStruct args[], va_list varargs)
+static void ClientArenaVarargs(ArgStruct args[MPS_ARGS_MAX], va_list varargs)
 {
   args[0].key = MPS_KEY_ARENA_SIZE;
   args[0].val.size = va_arg(varargs, Size);
diff --git a/mps/code/arenavm.c b/mps/code/arenavm.c
index 6e3256ae61a..f05ce46117b 100644
--- a/mps/code/arenavm.c
+++ b/mps/code/arenavm.c
@@ -446,7 +446,7 @@ static void VMChunkFinish(Chunk chunk)
 
 /* VMArenaVarargs -- parse obsolete varargs */
 
-static void VMArenaVarargs(ArgStruct args[], va_list varargs)
+static void VMArenaVarargs(ArgStruct args[MPS_ARGS_MAX], va_list varargs)
 {
   args[0].key = MPS_KEY_ARENA_SIZE;
   args[0].val.size = va_arg(varargs, Size);
diff --git a/mps/code/buffer.c b/mps/code/buffer.c
index 434635c9d3a..d9af5933fcd 100644
--- a/mps/code/buffer.c
+++ b/mps/code/buffer.c
@@ -1066,7 +1066,7 @@ void BufferRampReset(Buffer buffer)
 
 /* bufferTrivVarargs -- basic buffer varargs method */
 
-static void bufferTrivVarargs(ArgStruct args[], va_list varargs) {
+static void bufferTrivVarargs(ArgStruct args[MPS_ARGS_MAX], va_list varargs) {
   UNUSED(varargs);
   args[0].key = MPS_KEY_ARGS_END;
   AVER(ArgListCheck(args));
@@ -1486,7 +1486,7 @@ DEFINE_CLASS(SegBufClass, class)
 
 /* rankBufVarargs -- parse obsolete varargs into keywords */
 
-static void rankBufVarargs(ArgStruct args[], va_list varargs)
+static void rankBufVarargs(ArgStruct args[MPS_ARGS_MAX], va_list varargs)
 {
   args[0].key = MPS_KEY_RANK;
   args[0].val.rank = va_arg(varargs, Rank);
diff --git a/mps/code/mpm.h b/mps/code/mpm.h
index 5e3984a8b0c..ced8ec3e4f6 100644
--- a/mps/code/mpm.h
+++ b/mps/code/mpm.h
@@ -219,7 +219,7 @@ extern void PoolTraceEnd(Pool pool, Trace trace);
 extern void PoolWalk(Pool pool, Seg seg, FormattedObjectsStepMethod f,
                      void *v, size_t s);
 extern void PoolFreeWalk(Pool pool, FreeBlockStepMethod f, void *p);
-extern void PoolTrivVarargs(ArgStruct args[], va_list varargs);
+extern void PoolTrivVarargs(ArgStruct args[MPS_ARGS_MAX], va_list varargs);
 extern Res PoolTrivInit(Pool pool, ArgList arg);
 extern void PoolTrivFinish(Pool pool);
 extern Res PoolNoAlloc(Addr *pReturn, Pool pool, Size size,
diff --git a/mps/code/poolabs.c b/mps/code/poolabs.c
index 6fc0e279cb8..c29f409ae9b 100644
--- a/mps/code/poolabs.c
+++ b/mps/code/poolabs.c
@@ -195,7 +195,7 @@ void PoolTrivFinish(Pool pool)
   NOOP;
 }
 
-void PoolTrivVarargs(ArgStruct args[], va_list varargs)
+void PoolTrivVarargs(ArgStruct args[MPS_ARGS_MAX], va_list varargs)
 {
   UNUSED(varargs);
   args[0].key = MPS_KEY_ARGS_END;
diff --git a/mps/code/poolamc.c b/mps/code/poolamc.c
index 874b01b2b5d..09f39903437 100644
--- a/mps/code/poolamc.c
+++ b/mps/code/poolamc.c
@@ -937,7 +937,7 @@ static Bool amcNailRangeIsMarked(Seg seg, Addr base, Addr limit)
 
 /* amcVarargs -- decode obsolete varargs */
 
-static void AMCVarargs(ArgStruct args[], va_list varargs)
+static void AMCVarargs(ArgStruct args[MPS_ARGS_MAX], va_list varargs)
 {
   args[0].key = MPS_KEY_FORMAT;
   args[0].val.format = va_arg(varargs, Format);
diff --git a/mps/code/poolams.c b/mps/code/poolams.c
index b871bd98b68..ae7778562bb 100644
--- a/mps/code/poolams.c
+++ b/mps/code/poolams.c
@@ -730,7 +730,7 @@ static void AMSSegsDestroy(AMS ams)
 
 /* AMSVarargs -- decode obsolete varargs */
 
-static void AMSVarargs(ArgStruct args[], va_list varargs)
+static void AMSVarargs(ArgStruct args[MPS_ARGS_MAX], va_list varargs)
 {
   args[0].key = MPS_KEY_FORMAT;
   args[0].val.format = va_arg(varargs, Format);
@@ -742,7 +742,7 @@ static void AMSVarargs(ArgStruct args[], va_list varargs)
   AVER(ArgListCheck(args));
 }
 
-static void AMSDebugVarargs(ArgStruct args[], va_list varargs)
+static void AMSDebugVarargs(ArgStruct args[MPS_ARGS_MAX], va_list varargs)
 {
   args[0].key = MPS_KEY_POOL_DEBUG_OPTIONS;
   args[0].val.pool_debug_options = va_arg(varargs, mps_pool_debug_option_s *);
diff --git a/mps/code/poolawl.c b/mps/code/poolawl.c
index e77256ee236..42a47ea501a 100644
--- a/mps/code/poolawl.c
+++ b/mps/code/poolawl.c
@@ -521,7 +521,7 @@ static Bool AWLSegAlloc(Addr *baseReturn, Addr *limitReturn,
 
 /* AWLVarargs -- decode obsolete varargs */
 
-static void AWLVarargs(ArgStruct args[], va_list varargs)
+static void AWLVarargs(ArgStruct args[MPS_ARGS_MAX], va_list varargs)
 {
   args[0].key = MPS_KEY_FORMAT;
   args[0].val.format = va_arg(varargs, Format);
diff --git a/mps/code/poollo.c b/mps/code/poollo.c
index d59bc1995b8..3f9994954ca 100644
--- a/mps/code/poollo.c
+++ b/mps/code/poollo.c
@@ -469,7 +469,7 @@ static void LOWalk(Pool pool, Seg seg,
 
 /* LOVarargs -- decode obsolete varargs */
 
-static void LOVarargs(ArgStruct args[], va_list varargs)
+static void LOVarargs(ArgStruct args[MPS_ARGS_MAX], va_list varargs)
 {
   args[0].key = MPS_KEY_FORMAT;
   args[0].val.format = va_arg(varargs, Format);
diff --git a/mps/code/poolmfs.c b/mps/code/poolmfs.c
index 538be571934..b26bdc9d05c 100644
--- a/mps/code/poolmfs.c
+++ b/mps/code/poolmfs.c
@@ -79,7 +79,7 @@ Pool (MFSPool)(MFS mfs)
 
 /* MFSVarargs -- decode obsolete varargs */
 
-static void MFSVarargs(ArgStruct args[], va_list varargs)
+static void MFSVarargs(ArgStruct args[MPS_ARGS_MAX], va_list varargs)
 {
   args[0].key = MPS_KEY_EXTEND_BY;
   args[0].val.size = va_arg(varargs, Size);
diff --git a/mps/code/poolmv.c b/mps/code/poolmv.c
index 812d3099266..14cf2c12ce2 100644
--- a/mps/code/poolmv.c
+++ b/mps/code/poolmv.c
@@ -184,7 +184,7 @@ static Bool MVSpanCheck(MVSpan span)
 
 /* MVVarargs -- decode obsolete varargs */
 
-static void MVVarargs(ArgStruct args[], va_list varargs)
+static void MVVarargs(ArgStruct args[MPS_ARGS_MAX], va_list varargs)
 {
   args[0].key = MPS_KEY_EXTEND_BY;
   args[0].val.size = va_arg(varargs, Size);
@@ -196,7 +196,7 @@ static void MVVarargs(ArgStruct args[], va_list varargs)
   AVER(ArgListCheck(args));
 }
 
-static void MVDebugVarargs(ArgStruct args[], va_list varargs)
+static void MVDebugVarargs(ArgStruct args[MPS_ARGS_MAX], va_list varargs)
 {
   args[0].key = MPS_KEY_POOL_DEBUG_OPTIONS;
   args[0].val.pool_debug_options = va_arg(varargs, mps_pool_debug_option_s *);
diff --git a/mps/code/poolmv2.c b/mps/code/poolmv2.c
index 92b6708dec2..3ed4c65a9af 100644
--- a/mps/code/poolmv2.c
+++ b/mps/code/poolmv2.c
@@ -27,7 +27,7 @@ SRCID(poolmv2, "$Id$");
 /* Private prototypes */
 
 typedef struct MVTStruct *MVT;
-static void MVTVarargs(ArgStruct args[], va_list varargs);
+static void MVTVarargs(ArgStruct args[MPS_ARGS_MAX], va_list varargs);
 static Res MVTInit(Pool pool, ArgList arg);
 static Bool MVTCheck(MVT mvt);
 static void MVTFinish(Pool pool);
@@ -193,7 +193,7 @@ static SegPref MVTSegPref(MVT mvt)
 
 /* MVTVarargs -- decode obsolete varargs */
 
-static void MVTVarargs(ArgStruct args[], va_list varargs)
+static void MVTVarargs(ArgStruct args[MPS_ARGS_MAX], va_list varargs)
 {
   args[0].key = MPS_KEY_MIN_SIZE;
   args[0].val.size = va_arg(varargs, Size);
diff --git a/mps/code/poolmvff.c b/mps/code/poolmvff.c
index 4d3044aae86..02823df0e04 100644
--- a/mps/code/poolmvff.c
+++ b/mps/code/poolmvff.c
@@ -409,7 +409,7 @@ static void MVFFBufferEmpty(Pool pool, Buffer buffer,
 
 /* MVFFVarargs -- decode obsolete varargs */
 
-static void MVFFVarargs(ArgStruct args[], va_list varargs)
+static void MVFFVarargs(ArgStruct args[MPS_ARGS_MAX], va_list varargs)
 {
   args[0].key = MPS_KEY_EXTEND_BY;
   args[0].val.size = va_arg(varargs, Size);
@@ -427,7 +427,7 @@ static void MVFFVarargs(ArgStruct args[], va_list varargs)
   AVER(ArgListCheck(args));
 }
 
-static void MVFFDebugVarargs(ArgStruct args[], va_list varargs)
+static void MVFFDebugVarargs(ArgStruct args[MPS_ARGS_MAX], va_list varargs)
 {
   args[0].key = MPS_KEY_POOL_DEBUG_OPTIONS;
   args[0].val.pool_debug_options = va_arg(varargs, mps_pool_debug_option_s *);