X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/blobdiff_plain/11db3170da99e22aa0acea76debd6c7b590a629c..061ece7d6fedbde47030222fea74b575c12707dc:/src/imports.c

diff --git a/src/imports.c b/src/imports.c
index 852d285..9af14d9 100644
--- a/src/imports.c
+++ b/src/imports.c
@@ -1,6 +1,6 @@
 /*
 ** Splint - annotation-assisted static program checker
-** Copyright (C) 1994-2001 University of Virginia,
+** 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,8 +17,8 @@
 ** 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 information on splint: info@splint.org
+** To report a bug: splint-bug@splint.org
 ** For more information: http://www.splint.org
 */
 /*
@@ -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"
@@ -41,7 +41,6 @@
 # include "lslparse.h"
 # include "lh.h"
 # include "llmain.h"
-# include "portab.h"
 
 void
 outputLCSFile (char *path, char *msg, char *specname)
@@ -50,7 +49,7 @@ outputLCSFile (char *path, char *msg, char *specname)
   char *sfile = mstring_concat (specname, ".lcs");
   char *outfile = mstring_concat (path, sfile);
   char *s;
-  FILE *outfptr = fileTable_openFile (context_fileTable (), cstring_fromChars (outfile), "w");
+  FILE *outfptr = fileTable_openWriteFile (context_fileTable (), cstring_fromChars (outfile));
   sfree (sfile);
 
   DPRINTF (("Output lcl file: %s / %s / %s", path, specname, outfile));
@@ -124,7 +123,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;
 	}