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

[splint.git] / src / llerror.c

diff --git a/src/llerror.c b/src/llerror.c
index 67366586385c1014deb9ba3aa36d9995964abf72..4f108c481e19ab70751f63ee7b43895eb93f4391 100644 (file)
--- a/src/llerror.c
+++ b/src/llerror.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
@@ -30,7 +30,7 @@
 # include "splintMacros.nf"
 # include <string.h>
 # include <errno.h>
-# include "llbasic.h"
+# include "basic.h"
 # include "llmain.h"
 # include "cpperror.h"
 # include "Headers/version.h" /* Visual C++ finds a different version.h on some path! */
@@ -595,9 +595,12 @@ void
 llgenindentmsg (/*@only@*/ cstring s, fileloc fl)
 {
   cstring flstring = fileloc_unparse (fl);
-
+  int indentspaces = context_getLocIndentSpaces ();
   prepareMessage ();
-  (void) printIndentMessage (g_warningstream, message ("%q: %q", flstring, s), context_getIndentSpaces ());
+  
+  (void) printIndentMessage (g_warningstream, message ("%q: %q", flstring, s),
+                            indentspaces);
+
   closeMessage ();
 }
 
@@ -925,7 +928,22 @@ xllgenformattypeerror (char *srcFile, int srcLine,
 {
   if (!context_suppressFlagMsg (FLG_FORMATTYPE, fl))
     {
-      return llgentypeerroraux (srcFile, srcLine, FLG_FORMATTYPE, t1, e1, t2, e2, s, fl);
+      if (ctype_isInt (t1)
+         && ctype_isNumAbstract (t2))
+       {
+         if (!context_suppressFlagMsg (FLG_NUMABSTRACTPRINT, fl))
+           {
+             return llgentypeerroraux (srcFile, srcLine, FLG_NUMABSTRACTPRINT, t1, e1, t2, e2, s, fl);
+           }
+         else
+           {
+             return FALSE;
+           }
+       }
+      else
+       {
+         return llgentypeerroraux (srcFile, srcLine, FLG_FORMATTYPE, t1, e1, t2, e2, s, fl);
+       }
     }
   else
     {