Fixed problem with NULL being changed.

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

diff --git a/src/Headers/cstringTable.h b/src/Headers/cstringTable.h
index 576aa485dcc0e18c7a93f4277e44801c99e780b5..a08f4c974b7303c779b6a0b3125f5dad5bbae433 100644 (file)
--- a/src/Headers/cstringTable.h
+++ b/src/Headers/cstringTable.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.
 **
 */
@@ -20,13 +20,13 @@
    abst_typedef null struct _cstringTable *cstringTable;
 */
 
-/*@private@*/ typedef struct 
+/*:private:*/ typedef struct 
 {
   /*@only@*/ cstring key;
   int val;
 } *hentry;
 
-/*@private@*/ typedef /*@only@*/ hentry o_hentry;
+/*:private:*/ typedef /*@only@*/ hentry o_hentry;
 
 typedef /*@null@*/ struct
 {
@@ -39,8 +39,8 @@ typedef /*@only@*/ hbucket o_hbucket;
 
 struct s_cstringTable
 {
-  int size;
-  int nentries;
+  unsigned long size;
+  unsigned long nentries;
   /*@only@*/ o_hbucket *buckets;
 } ;
 
@@ -48,13 +48,13 @@ struct s_cstringTable
 /*@constant null cstringTable cstringTable_undefined; @*/
 # define cstringTable_undefined      ((cstringTable) NULL)
 
-extern /*@falsenull@*/ bool cstringTable_isDefined(cstringTable) /*@*/ ;
+extern /*@falsewhennull@*/ bool cstringTable_isDefined(cstringTable) /*@*/ ;
 # define cstringTable_isDefined(p_h) ((p_h) != cstringTable_undefined)
 
-extern /*@truenull@*/ /*@unused@*/ bool cstringTable_isUndefined(cstringTable) /*@*/ ;
+extern /*@nullwhentrue@*/ /*@unused@*/ bool cstringTable_isUndefined(cstringTable) /*@*/ ;
 # define cstringTable_isUndefined(p_h) ((p_h) == cstringTable_undefined)
 
-extern /*@only@*/ cstringTable cstringTable_create(int p_size) /*@*/ ;
+extern /*@only@*/ cstringTable cstringTable_create(unsigned long p_size) /*@*/ ;
 extern void cstringTable_insert (cstringTable p_h, 
                                 /*@only@*/ cstring p_key, 
                                 int p_value) /*@modifies p_h@*/ ;