Fixed some splintme errors from the previous code change.

[splint.git] / src / functionClause.c

diff --git a/src/functionClause.c b/src/functionClause.c
index fc8a2bee46a5598b79a7924bf0b7c4642e33616d..a127ed45f31c12965949e4b15bbe72eda64f5f2e 100644 (file)
--- a/src/functionClause.c
+++ b/src/functionClause.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-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 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
 */
 /*
 ** functionClause.c
 */
 
-# include "lclintMacros.nf"
+# include "splintMacros.nf"
 # include "basic.h"
 
 static /*@only@*/ /*@notnull@*/ /*@special@*/ functionClause  /*@i32 need special? @*/
@@ -52,10 +52,20 @@ extern functionClause functionClause_createModifies (modifiesClause node) /*@*/
 }
 
 extern functionClause functionClause_createState (stateClause node) /*@*/ 
-{ 
-  functionClause res = functionClause_alloc (FCK_STATE);
-  res->val.state = node;
-  return res;
+{
+  if (stateClause_hasEmptyReferences (node) &&
+      (!stateClause_isMetaState (node) ) )
+    {
+      DPRINTF((message("functionClause_createState:: Returning functionClause_undefined" ) ));
+      stateClause_free (node);
+      return functionClause_undefined;
+    }
+  else
+    {
+      functionClause res = functionClause_alloc (FCK_STATE);
+      res->val.state = node;
+      return res;
+    }
 }
 
 extern functionClause functionClause_createEnsures (functionConstraint node) /*@*/ 
@@ -101,10 +111,10 @@ extern functionClause functionClause_createWarn (warnClause node) /*@*/
     case FCK_REQUIRES:
       return message ("requires %q", functionConstraint_unparse (p->val.constraint));
     case FCK_DEAD:
-      BADBRANCH;
+      return cstring_makeLiteral ("<dead clause>");
     }
 
-  BADBRANCH;
+  BADBRANCHRET (cstring_undefined);
 }
 
 extern bool functionClause_matchKind (functionClause p, functionClauseKind kind) /*@*/
@@ -219,6 +229,8 @@ extern void functionClause_free (/*@only@*/ functionClause node)
 {
   if (node != NULL)
     {
+      DPRINTF (("free: %s", functionClause_unparse (node)));
+
       switch (node->kind)
        {
        case FCK_GLOBALS: