Fixed all /*@i...@*/ tags (except 1).

[splint.git] / src / imports.c

diff --git a/src/imports.c b/src/imports.c
index 8b20a5cdca39ad4fa5361f6e271f9993407dda50..c6c4441ec5de19af3fe693e312733f902057d2a7 100644 (file)
--- a/src/imports.c
+++ b/src/imports.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
 */
 /*
 ** imports.c
@@ -31,8 +31,8 @@
 **         Massachusetts Institute of Technology
 */
 
-# include "lclintMacros.nf"
-# include "llbasic.h" 
+# include "splintMacros.nf"
+# include "basic.h" 
 # include "osd.h"
 # include "llgrammar.h" /* need simpleOp, MULOP and logicalOp in makeInfixTermNode */
 # include "lclscan.h"
@@ -42,7 +42,6 @@
 # include "lh.h"
 # include "llmain.h"
 # include "portab.h"
-# include "herald.h"
 
 void
 outputLCSFile (char *path, char *msg, char *specname)
@@ -51,15 +50,15 @@ outputLCSFile (char *path, char *msg, char *specname)
   char *sfile = mstring_concat (specname, ".lcs");
   char *outfile = mstring_concat (path, sfile);
   char *s;
-  FILE *outfptr = fopen (outfile, "w");
+  FILE *outfptr = fileTable_openWriteFile (context_fileTable (), cstring_fromChars (outfile));
   sfree (sfile);
 
   DPRINTF (("Output lcl file: %s / %s / %s", path, specname, outfile));
   
   /* check write permission */
   
-  if (outfptr == 0)
-    {                          /* fopen fails */
+  if (outfptr == NULL) /* Cannot open file */
+    {                  
       if (!haserror)
        {
          lclplainerror (message ("Cannot write to output file: %s", 
@@ -91,7 +90,7 @@ outputLCSFile (char *path, char *msg, char *specname)
   sort_dump (outfptr, TRUE);
   symtable_dump (g_symtab, outfptr, TRUE);
 
-  check (fclose (outfptr) == 0);  
+  check (fileTable_closeFile (context_fileTable (), outfptr));  
   sfree (outfile);  
 }
 
@@ -125,7 +124,7 @@ importCTrait (void)
          callLSL (cstring_makeLiteralTemp (CTRAITSPECNAME),
                   message ("includes %s (%s for String)",
                            cstring_fromChars (CTRAITFILENAMEN), 
-                           cstring_fromChars (sort_getName (sort_cstring))));
+                           cstring_fromChars (sort_getName (g_sortCstring))));
          cstring_free (infile);
          break;
        }