X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/blobdiff_plain/6fcd0b1e01252139211d34a4476d377cf6e5f37a..HEAD:/src/fileloc.c

diff --git a/src/fileloc.c b/src/fileloc.c
index 23e4e7f..0c6cb2f 100644
--- a/src/fileloc.c
+++ b/src/fileloc.c
@@ -1,6 +1,6 @@
 /*
 ** Splint - annotation-assisted static program checker
-** Copyright (C) 1994-2002 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
@@ -26,7 +26,7 @@
 */
 /*
  * Modified by Herbert 04/19/97:
- * - added new include file portab.h.
+ * - added new include file portab.h (now in osd.h)
  * - added new private function fileloc_filenameForCpp() to handle
  *   filenames belonging to "#line" statements for OS/2 and MSDOS. It
  *   gets called by fileloc_lineMarker() and fileloc_previousLineMarker()
@@ -34,9 +34,8 @@
  */
 
 # include "splintMacros.nf"
-# include "llbasic.h"
+# include "basic.h"
 # include "osd.h"
-# include "portab.h"
 
 static /*@only@*/ fileloc fileloc_createPrim (flkind p_kind, fileId p_fid, int p_line, int p_col) /*@*/ ;
 
@@ -89,7 +88,7 @@ fileloc_decColumn (fileloc f, int x)
 
   if (x > 0 && fileloc_isDefined (ret))
     {
-      llassertprint (ret->column > x, ("decColumn: %d", x));
+      llassertprint (ret->column > x, ("decColumn %s: %d", fileloc_unparse (f), x));
       ret->column -= x;
     }
 
@@ -671,7 +670,7 @@ fileloc_column (fileloc f)
 /*@only@*/ cstring
 fileloc_unparse (fileloc f)
 {
-  static in_funparse = FALSE;
+  static bool in_funparse = FALSE;
   bool parenFormat = context_getFlag (FLG_PARENFILEFORMAT); 
   bool htmlFormat = context_getFlag (FLG_HTMLFILEFORMAT);
   cstring res = cstring_undefined;
@@ -794,7 +793,7 @@ fileloc_unparse (fileloc f)
     {
       res = cstring_makeLiteral ("< Location unknown >");
     }
-  /*@=branchstate@*/ /*@i2523 this is a spurious warning because of the break */
+  /*@=branchstate@*/ /* this is a spurious warning because of the break */
   
   in_funparse = FALSE;
   return res;