Fixes after removing -unrecogcomments flag for make splintme.

[splint.git] / src / stateClauseList.c

diff --git a/src/stateClauseList.c b/src/stateClauseList.c
index 861cb5131f06f086b253c769f24300c071163a39..fe5bf2ef40894f073a7b65780c54b0462eba0a14 100644 (file)
--- a/src/stateClauseList.c
+++ b/src/stateClauseList.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,15 +17,15 @@
 ** 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
 */
 /*
 ** stateClauseList.c
 */
 
-# include "lclintMacros.nf"
+# include "splintMacros.nf"
 # include "basic.h"
 
 static /*@notnull@*/ stateClauseList stateClauseList_new (void)
@@ -252,7 +252,7 @@ void stateClauseList_checkAll (uentry ue)
 
       if (stateClause_isGlobal (cl))
        {
-         /*@i232@*/
+         ; 
        }
       else
        {
@@ -297,7 +297,7 @@ void stateClauseList_checkAll (uentry ue)
                                    stateClause_unparse (cl)),
                           uentry_whereLast (ue)))
                        {
-                         /*@i! annotationInfo_showContextError (ainfo, ue); */
+                         /* annotationInfo_showContextError (ainfo, ue); */
                        }
                    }
                }
@@ -359,10 +359,12 @@ void stateClauseList_checkAll (uentry ue)
                        {
                          ; /* Okay to override in .xh files */
                        }
+                     else if (stateClause_isQual (cl))
+                       {
+                         ; /* qual clauses don't interfere with definition state */
+                       }
                      else
                        {
-                         TPRINTF (("Not xh: %s", fileloc_unparse (uentry_whereLast (ue))));
-
                          voptgenerror 
                            (FLG_INCONDEFS,
                             message ("Reference %q used in %q clause of %q, "
@@ -394,7 +396,7 @@ void stateClauseList_checkAll (uentry ue)
                    {
                      voptgenerror
                        (FLG_ANNOTATIONERROR,
-                        /*@-sefparams@*/ /* This is okay because its fresh storage. */ /*@i32@*/
+                        /*@-sefparams@*/ /* This is okay because its fresh storage. */
                         message 
                         ("%q clauses includes %q of "
                          "non-dynamically allocated type %s",
@@ -449,7 +451,7 @@ void stateClauseList_checkEqual (uentry old, uentry unew)
        {
          if (stateClause_isGlobal (cl))
            {
-             ; /*@i32@*/ 
+             ; /* Don't handle globals for now */
            }
          else
            {