From 89a685f16488555436a7e70782ab3ac6132a59bf Mon Sep 17 00:00:00 2001 From: Richard Brooksby Date: Sat, 1 Sep 2012 10:18:08 +0100 Subject: Renaming some check* macros with more accurate names, making remaining check* macros similar in function. Copied from Perforce Change: 179155 ServerID: perforce.ravenbrook.com --- mps/code/buffer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mps/code/buffer.c') diff --git a/mps/code/buffer.c b/mps/code/buffer.c index d8346c49e9c..9b7748c6572 100644 --- a/mps/code/buffer.c +++ b/mps/code/buffer.c @@ -149,7 +149,7 @@ Res BufferDescribe(Buffer buffer, mps_lib_FILE *stream) Res res; char abzMode[5]; - if (!CHECKT(Buffer, buffer)) return ResFAIL; + if (!TESTT(Buffer, buffer)) return ResFAIL; if (stream == NULL) return ResFAIL; abzMode[0] = (char)( (buffer->mode & BufferModeTRANSITION) ? 't' : '_' ); @@ -1185,7 +1185,7 @@ static void bufferNoReassignSeg (Buffer buffer, Seg seg) static Res bufferTrivDescribe(Buffer buffer, mps_lib_FILE *stream) { - if (!CHECKT(Buffer, buffer)) return ResFAIL; + if (!TESTT(Buffer, buffer)) return ResFAIL; if (stream == NULL) return ResFAIL; /* dispatching function does it all */ return ResOK; @@ -1444,10 +1444,10 @@ static Res segBufDescribe(Buffer buffer, mps_lib_FILE *stream) BufferClass super; Res res; - if (!CHECKT(Buffer, buffer)) return ResFAIL; + if (!TESTT(Buffer, buffer)) return ResFAIL; if (stream == NULL) return ResFAIL; segbuf = BufferSegBuf(buffer); - if (!CHECKT(SegBuf, segbuf)) return ResFAIL; + if (!TESTT(SegBuf, segbuf)) return ResFAIL; /* Describe the superclass fields first via next-method call */ super = BUFFER_SUPERCLASS(SegBufClass); -- cgit v1.2.1 From d3aacdebfc18450b32531dadf7d9c2d4091faba6 Mon Sep 17 00:00:00 2001 From: Richard Brooksby Date: Mon, 3 Sep 2012 13:15:34 +0100 Subject: Suppressing warnings revealed by increased level of optimisation and building the mps from mps.c Copied from Perforce Change: 179192 ServerID: perforce.ravenbrook.com --- mps/code/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mps/code/buffer.c') diff --git a/mps/code/buffer.c b/mps/code/buffer.c index 9b7748c6572..c7dc6edd82e 100644 --- a/mps/code/buffer.c +++ b/mps/code/buffer.c @@ -1330,7 +1330,7 @@ static void segBufAttach(Buffer buffer, Addr base, Addr limit, Addr init, Size size) { SegBuf segbuf; - Seg seg; + Seg seg = NULL; /* suppress "may be used uninitialized" */ Arena arena; Bool found; -- cgit v1.2.1