Fixed some splintme errors from the previous code change.

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

diff --git a/src/Headers/constraintList.h b/src/Headers/constraintList.h
index c17bf6c21b9a22b368e9a3cd74f6810cca2615c7..85c2f38915e2c79d0ccba9c79f4eec556bb517c6 100644 (file)
--- a/src/Headers/constraintList.h
+++ b/src/Headers/constraintList.h
@@ -18,14 +18,18 @@ struct s_constraintList
 
 # define constraintList_undefined ((constraintList)NULL)
 
-extern /*@falsenull@*/ bool constraintList_isDefined (constraintList p_e) /*@*/ ;
-extern /*@unused@*/ /*@truenull@*/ bool constraintList_isUndefined (constraintList p_e) /*@*/ ;
-extern /*@truenull@*/ /*@unused@*/ bool constraintList_isError (constraintList p_e) /*@*/ ;
+extern /*@falsewhennull@*/ bool constraintList_isDefined (constraintList p_e) /*@*/ ;
+extern /*@unused@*/ /*@nullwhentrue@*/ bool constraintList_isUndefined (constraintList p_e) /*@*/ ;
+extern /*@nullwhentrue@*/ /*@unused@*/ bool constraintList_isError (constraintList p_e) /*@*/ ;
 
 # define constraintList_isDefined(e)    ((e) != constraintList_undefined)
 # define constraintList_isUndefined(e)  ((e) == constraintList_undefined)
 # define constraintList_isError(e)      ((e) == constraintList_undefined)
 
+extern bool constraintList_isEmpty (/*@sef@*/ constraintList p_e) /*@*/;
+
+# define constraintList_isEmpty(e)      ((constraintList_isUndefined((e)) ) ||(( (e)->nelements == 0) ) )
+
 extern constraintList constraintList_single (/*@only@*/ constraint) ;
 
 extern constraintList constraintList_addListFree (/*@returned@*/ constraintList, /*@only@*/ constraintList) ;
@@ -42,7 +46,7 @@ extern constraintList constraintList_preserveCallInfo (/*@returned@*/ constraint
 extern /*@only@*/ constraintList constraintList_makeNew(void) /*@*/;
 extern constraintList constraintList_add (/*@returned@*/ constraintList p_s, /*@only@*/ constraint p_el) /*@modifies p_s@*/ ;
 
-extern /*@only@*/ constraintList constraintList_addList (/*@only@*/ /*@returned@*/ constraintList p_s, /*@observer@*/ constraintList p_newList) /*@modifies p_s@*/  ;
+     extern /*@only@*/ constraintList constraintList_addList (/*@only@*/ /*@returned@*/ constraintList p_s, /*@observer@*/ /*@temp@*/ constraintList p_newList) /*@modifies p_s@*/  ;
 
 
 extern constraintList constraintList_copy ( /*@observer@*/ /*@temp@*/ constraintList p_s) /*@*/ ;
@@ -87,6 +91,11 @@ extern constraintList constraintList_sort (/*@returned@*/ constraintList p_ret)
 void constraintList_dump (/*@observer@*/ constraintList p_c,  FILE * p_f);
 
 /*@only@*/ constraintList constraintList_undump (FILE * p_f);
+/*@only@*/ constraintList constraintList_removeSurpressed (/*@only@*/ constraintList p_s);
+
+/*drl 1/6/2001: I didn't think these functions were solid enough to include in the   stable  release of splint.*/
+/*drl added 12/30/01 */
+/* / *@only@* / constraintList constraintList_doSRefFixStructConstraint(constraintList p_invars, sRef p_s, ctype p_ct ); */
 
 # else
 # error "Multiple include"