Fixes after removing -unrecogcomments flag for make splintme.

[splint.git] / src / Headers / functionClause.h

diff --git a/src/Headers/functionClause.h b/src/Headers/functionClause.h
index cb57af88311c30f772836fea37f396478af7dd0e..3b24bc72a83c48f6a52d6811cc48469f68a00c34 100644 (file)
--- a/src/Headers/functionClause.h
+++ b/src/Headers/functionClause.h
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) University of Virginia, Massachusetts Institue of Technology 1994-2001.
+** Copyright (C) University of Virginia, Massachusetts Institue of Technology 1994-2003.
 ** See ../LICENSE for license information.
 **
 */
@@ -10,7 +10,7 @@
 # ifndef FUNCTIONCLAUSE_H
 # define FUNCTIONCLAUSE_H
 
-/*@private@*/ typedef enum { 
+/*:private:*/ typedef enum { 
   FCK_GLOBALS,
   FCK_MODIFIES,
   FCK_WARN,
@@ -23,11 +23,11 @@
 struct s_functionClause {
   functionClauseKind kind;
   union {
-    globalsClause globals;
-    modifiesClause modifies;
-    warnClause warn;
-    stateClause state;
-    functionConstraint constraint;
+    /*@null@*/ globalsClause globals;
+    /*@null@*/ modifiesClause modifies;
+    /*@null@*/ warnClause warn;
+    /*@null@*/ stateClause state;
+    /*@null@*/ functionConstraint constraint;
   } val;
 } ;
 
@@ -36,7 +36,7 @@ struct s_functionClause {
 /*@constant null functionClause functionClause_undefined; @*/
 # define functionClause_undefined NULL
 
-extern /*@falsenull@*/ bool functionClause_isDefined(functionClause) /*@*/ ;
+extern /*@falsewhennull@*/ bool functionClause_isDefined(functionClause) /*@*/ ;
 # define functionClause_isDefined(p_h) ((p_h) != functionClause_undefined)
 
 extern bool functionClause_isGlobals (functionClause) /*@*/ ;
@@ -59,7 +59,7 @@ extern bool functionClause_isEnsures (functionClause) /*@*/ ;
 extern bool functionClause_isRequires (functionClause) /*@*/ ;
 # define functionClause_isRequires(p_h) (functionClause_matchKind(p_h, FCK_REQUIRES))
 
-extern /*@truenull@*/ bool functionClause_isUndefined(functionClause) /*@*/ ;
+extern /*@nullwhentrue@*/ bool functionClause_isUndefined(functionClause) /*@*/ ;
 # define functionClause_isUndefined(p_h) ((p_h) == functionClause_undefined)
 
 extern functionClause functionClause_createGlobals (/*@only@*/ globalsClause) /*@*/ ;