Cleaned up code problems reported by make splintme.

[splint.git] / src / annotationInfo.c

diff --git a/src/annotationInfo.c b/src/annotationInfo.c
index e270010849df405d582bd7bc4f7ad3fa6160b14b..26e7bcc3ca06e067a8aa216dd68f71bbfa6e520d 100644 (file)
--- a/src/annotationInfo.c
+++ b/src/annotationInfo.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-2002 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 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
 */
 /*
 ** annotationInfo.c
 */
 
-# include "lclintMacros.nf"
+# include "splintMacros.nf"
 # include "basic.h"
 
 annotationInfo annotationInfo_create (cstring name,
@@ -49,6 +49,7 @@ void annotationInfo_free (annotationInfo ainfo)
     {
       cstring_free (ainfo->name);
       fileloc_free (ainfo->loc);
+      mtContextNode_free (ainfo->context); /* evans 2002-01-03 */
       sfree (ainfo);
     }
 }
@@ -171,5 +172,32 @@ cstring annotationInfo_dump (annotationInfo ainfo)
       return ainfo;
     }
 
-  BADBRANCH;
+  BADBRANCHRET (annotationInfo_undefined);
+}
+
+void annotationInfo_showContextRefError (annotationInfo a, sRef sr)
+{
+  mtContextNode mcontext;
+  llassert (!annotationInfo_matchesContextRef (a, sr));
+  llassert (annotationInfo_isDefined (a));
+  mcontext = a->context;
+
+  if (mtContextNode_matchesRef (mcontext, sr))
+    {
+      /* Matches annotation context, must also match meta state context. */
+      metaStateInfo minfo = a->state;
+
+      if (mtContextNode_matchesRef (metaStateInfo_getContext (minfo), sr))
+       {
+         BADBRANCH;
+       }
+      else
+       {
+         mtContextNode_showRefError (metaStateInfo_getContext (minfo), sr);
+       }
+    }
+  else
+    {
+      mtContextNode_showRefError (mcontext, sr);
+    }
 }