Made allocations involving sizeof work correctly (test/malloc.c).

[splint.git] / src / functionClauseList.c

diff --git a/src/functionClauseList.c b/src/functionClauseList.c
index 665605ca7b8cbcf8b04c7ae330c50428ba688ada..cb1a43222212d7424a9b2262d444bce4f6f78531 100644 (file)
--- a/src/functionClauseList.c
+++ b/src/functionClauseList.c
@@ -94,10 +94,10 @@ functionClauseList functionClauseList_add (functionClauseList s, /*@keep@*/ func
     }
   
   s->nspace--;
-  /*@i32@*/ s->elements[s->nelements] = el;
+  s->elements[s->nelements] = el;
   s->nelements++;
 
-  /*@i32@*/ return s;
+  return s;
 }
 
 functionClauseList functionClauseList_prepend (functionClauseList s, /*@keep@*/ functionClause el)
@@ -106,7 +106,7 @@ functionClauseList functionClauseList_prepend (functionClauseList s, /*@keep@*/
 
   if (!functionClauseList_isDefined (s))
     {
-      /*@i32@*/ return functionClauseList_single (el);
+      return functionClauseList_single (el);
     }
 
   if (s->nspace <= 0)
@@ -121,10 +121,10 @@ functionClauseList functionClauseList_prepend (functionClauseList s, /*@keep@*/
       s->elements[i] = s->elements [i - 1];
     }
 
-  /*@i32@*/ s->elements[0] = el;
+  s->elements[0] = el;
   s->nelements++;
-
-  /*@i32@*/ return s;
+  
+  return s;
 }
 
 cstring
@@ -173,17 +173,16 @@ functionClauseList_free (functionClauseList s)
 }
 
 functionClauseList 
-functionClauseList_setImplictConstraints (/*@returned@*/ functionClauseList s)
+functionClauseList_setImplicitConstraints (/*@returned@*/ functionClauseList s)
 {
   bool addedConstraints;
 
   constraintList c;
   
-  DPRINTF ((message ("functionClauseList_setImplictConstraints called ") ));
+  DPRINTF ((message ("functionClauseList_setImplicitConstraints called ") ));
   
   addedConstraints = FALSE;
 
-
   c = getImplicitFcnConstraints ();
   
   if (constraintList_isEmpty(c) )
@@ -203,21 +202,20 @@ functionClauseList_setImplictConstraints (/*@returned@*/ functionClauseList s)
                {
                  constraintList implCons = getImplicitFcnConstraints ();
                  
-                 DPRINTF ((message ("functionClauseList_ImplictConstraints adding the implict constraints: %s to %s",
+                 DPRINTF ((message ("functionClauseList_ImplicitConstraints adding the implict constraints: %s to %s",
                                     constraintList_print(implCons), constraintList_print (con->constraint.buffer))));
                  
                  functionConstraint_addBufferConstraints (con, constraintList_copy (implCons) );
 
                  addedConstraints = TRUE;
                  
-                 DPRINTF ((message ("functionClauseList_ImplictConstraints the new constraint is %s",
+                 DPRINTF ((message ("functionClauseList_ImplicitConstraints the new constraint is %s",
                                     functionConstraint_unparse (con))));
 
                }
              else
                {
                  llassert (FALSE);
-                 /*@i2523 fix this */
                }
            }
        }