Fixed problem with NULL being changed.

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

diff --git a/src/Headers/metaStateTable.h b/src/Headers/metaStateTable.h
index 9420cd91b83f9095e2db12bdb10c90ade9197908..59a1e80d3c9a353e13434abc7653bcca52de9d15 100644 (file)
--- a/src/Headers/metaStateTable.h
+++ b/src/Headers/metaStateTable.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.
 */
 /*
@@ -23,10 +23,10 @@
 /*@constant null metaStateTable metaStateTable_undefined; @*/
 # define metaStateTable_undefined genericTable_undefined
 
-extern /*@falsenull@*/ bool metaStateTable_isDefined(metaStateTable) /*@*/ ;
+extern /*@falsewhennull@*/ bool metaStateTable_isDefined(metaStateTable) /*@*/ ;
 # define metaStateTable_isDefined(p_h) (genericTable_isDefined ((genericTable) (p_h)))
 
-extern /*@truenull@*/ bool metaStateTable_isUndefined(metaStateTable) /*@*/ ;
+extern /*@nullwhentrue@*/ bool metaStateTable_isUndefined(metaStateTable) /*@*/ ;
 # define metaStateTable_isUndefined(p_h) (genericTable_isDefined ((genericTable) (p_h)))
 
 /*@constant int DEFAULT_MSTABLE_SIZE@*/
@@ -43,8 +43,10 @@ extern void metaStateTable_insert (metaStateTable p_h,
 extern /*@null@*/ /*@dependent@*/ /*@exposed@*/ metaStateInfo
    metaStateTable_lookup (metaStateTable p_h, cstring p_key) /*@*/ ;
 
+/*@access metaStateInfo@*/ 
 # define metaStateTable_lookup(p_h,p_key) \
-  (/*@i523@*/ /*@access metaStateInfo@*/ (metaStateInfo) genericTable_lookup ((genericTable) (p_h), p_key) /*@noaccess metaStateInfo@*/)
+  ((metaStateInfo) genericTable_lookup ((genericTable) (p_h), p_key))
+/*@noaccess metaStateInfo@*/
 
 extern bool metaStateTable_contains (metaStateTable p_h, cstring p_key) /*@*/ ;
 # define metaStateTable_contains(p_h,p_key) \