noexpand always false.

[splint.git] / src / mtreader.c

diff --git a/src/mtreader.c b/src/mtreader.c
index b069fbe1c95e8a8d886e82640fcb993a9f1bc727..c4b09d04b99f4b3e87218c95cd5ee8304724fa1a 100644 (file)
--- a/src/mtreader.c
+++ b/src/mtreader.c
@@ -1,6 +1,6 @@
 /*
-** LCLint - annotation-assisted static program checker
-** Copyright (C) 1994-2001 University of Virginia,
+** Splint - annotation-assisted static program checker
+** Copyright (C) 1994-2003 University of Virginia,
 **         Massachusetts Institute of Technology
 **
 ** This program is free software; you can redistribute it and/or modify it
@@ -17,9 +17,9 @@
 ** the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 ** MA 02111-1307, USA.
 **
-** For information on lclint: lclint-request@cs.virginia.edu
-** To report a bug: lclint-bug@cs.virginia.edu
-** For more information: http://lclint.cs.virginia.edu
+** For information on splint: info@splint.org
+** To report a bug: splint-bug@splint.org
+** For more information: http://www.splint.org
 */
 /*
 ** mtreader.c
@@ -27,8 +27,8 @@
 ** Controls reading of .mts files.
 */
 
-# include "lclintMacros.nf"
-# include "llbasic.h"
+# include "splintMacros.nf"
+# include "basic.h"
 # include "mtgrammar.h"
 # include "mtscanner.h"
 
@@ -43,8 +43,7 @@ void mtreader_readFile (cstring infile)
   if (!inputStream_getPath (context_getLarchPath (), sourceFile))
     {
       lldiagmsg
-       (message ("Metastate definition: can't find file %s",
-                 inputStream_fileName (sourceFile)));
+       (message ("Cannot find metastate file: %s", inputStream_fileName (sourceFile)));
       inputStream_free (sourceFile);
       return;
     }
@@ -72,18 +71,14 @@ void mtreader_readFile (cstring infile)
     }
 
   context_setFileId (fid);
-
-  if (context_getFlag (FLG_SHOWSCAN))
-    {
-      lldiagmsg (message ("< reading metastate %s >", fname));
-    }
+  displayScan (message ("reading metastate %s", fname));
   
   mtscanner_reset (sourceFile);
   context_enterMTfile ();
   (void) mtparse ();
   context_exitMTfile ();
 
-  inputStream_close (sourceFile);
+  check (inputStream_close (sourceFile));
   inputStream_free (sourceFile);
 }