1 files changed, 5 insertions, 5 deletions

diff --git a/mps/code/buffer.c b/mps/code/buffer.c
index d8346c49e9c..c7dc6edd82e 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;
@@ -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;
 
@@ -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);