mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 12:21:25 -08:00
Code Issues Projects Releases Wiki Activity

Replacing duplicate *trivvarargs methods with a single implementation in args.c.

Browse source 
Copied from Perforce
 Change: 181851
 ServerID: perforce.ravenbrook.com
This commit is contained in:
Richard Brooksby 2013-05-16 13:10:01 +01:00
parent bb02f55b62
commit 818a65f36f
6 changed files with 15 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

12
mps/code/arena.c
View file

@ -46,16 +46,6 @@ static Res ArenaTrivDescribe(Arena arena, mps_lib_FILE *stream)
}
/* ArenaTrivVarargs -- ignore obsolete varargs for future arena classes */
static void ArenaTrivVarargs(ArgStruct args[MPS_ARGS_MAX], va_list varargs)
{
UNUSED(varargs);
args[0].key = MPS_KEY_ARGS_END;
AVER(ArgListCheck(args));
}
/* AbstractArenaClass -- The abstract arena class definition
*
* .null: Most abstract class methods are set to NULL. See
@ -69,7 +59,7 @@ DEFINE_CLASS(AbstractArenaClass, class)
class->name = "ABSARENA";
class->size = 0;
class->offset = 0;
class->varargs = ArenaTrivVarargs;
class->varargs = ArgTrivVarargs;
class->init = NULL;
class->finish = NULL;
class->reserved = NULL;

11
mps/code/arg.c
View file

@ -167,6 +167,17 @@ void ArgRequire(ArgStruct *argOut, ArgList args, Key key) {
}
/* ArgTrivVarargs -- class method to ignore deprecated varargs */
void ArgTrivVarargs(ArgStruct args[MPS_ARGS_MAX], va_list varargs)
{
UNUSED(varargs);
args[0].key = MPS_KEY_ARGS_END;
AVER(ArgListCheck(args));
}
/* C. COPYRIGHT AND LICENSE
*
* Copyright (C) 2001-2013 Ravenbrook Limited <http://www.ravenbrook.com/>.

1
mps/code/arg.h
View file

@ -38,6 +38,7 @@ extern Bool ArgListCheck(ArgList args);
extern Bool ArgPick(ArgStruct *argOut, ArgList args, Key key);
extern void ArgRequire(ArgStruct *argOut, ArgList args, Key key);
extern void ArgTrivVarargs(ArgStruct args[MPS_ARGS_MAX], va_list varargs);
extern Bool ArgCheckCant(Arg arg);
extern Bool ArgCheckFormat(Arg arg);

11
mps/code/buffer.c
View file

@ -1064,15 +1064,6 @@ void BufferRampReset(Buffer buffer)
/* BufferClass -- support for the basic Buffer class */
/* bufferTrivVarargs -- basic buffer varargs method */
static void bufferTrivVarargs(ArgStruct args[MPS_ARGS_MAX], va_list varargs) {
UNUSED(varargs);
args[0].key = MPS_KEY_ARGS_END;
AVER(ArgListCheck(args));
}
/* bufferTrivInit -- basic buffer init method */
static Res bufferTrivInit(Buffer buffer, Pool pool, ArgList args)
@ -1215,7 +1206,7 @@ DEFINE_CLASS(BufferClass, class)
INHERIT_CLASS(&class->protocol, ProtocolClass);
class->name = "BUFFER";
class->size = sizeof(BufferStruct);
class->varargs = bufferTrivVarargs;
class->varargs = ArgTrivVarargs;
class->init = bufferTrivInit;
class->finish = bufferTrivFinish;
class->attach = bufferTrivAttach;

1
mps/code/mpm.h
View file

@ -219,7 +219,6 @@ 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[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,

9
mps/code/poolabs.c
View file

@ -122,7 +122,7 @@ DEFINE_CLASS(AbstractPoolClass, class)
class->size = 0;
class->offset = 0;
class->attr = 0;
class->varargs = PoolTrivVarargs;
class->varargs = ArgTrivVarargs;
class->init = PoolTrivInit;
class->finish = PoolTrivFinish;
class->alloc = PoolNoAlloc;
@ -195,13 +195,6 @@ void PoolTrivFinish(Pool pool)
NOOP;
}
void PoolTrivVarargs(ArgStruct args[MPS_ARGS_MAX], va_list varargs)
{
UNUSED(varargs);
args[0].key = MPS_KEY_ARGS_END;
AVER(ArgListCheck(args));
}
Res PoolTrivInit(Pool pool, ArgList args)
{
AVERT(Pool, pool);