X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/blobdiff_plain/bb25bea60268559306e8a0fc4d44990ba3ebea32..920a3797c23377bfb7332b0c11bda1d708cabb72:/src/forjunk.c

diff --git a/src/forjunk.c b/src/forjunk.c
index 62ff3ef..861d400 100644
--- a/src/forjunk.c
+++ b/src/forjunk.c
@@ -14,7 +14,6 @@
 # include "aliasChecks.h"
 # include "exprNodeSList.h"
 
-# include "exprData.i"
 # include "exprDataQuite.i"
 
 /*@access constraint, exprNode @*/
@@ -286,7 +285,6 @@ static /*@only@*/ constraintExpr constraintExpr_searchAndAdd (/*@only@*/ constra
   
   if ( constraintExpr_similar (c, find) )
     {
-      #warning mem leak
 
       constraintExpr new;
       
@@ -295,7 +293,7 @@ static /*@only@*/ constraintExpr constraintExpr_searchAndAdd (/*@only@*/ constra
       cPrint = constraintExpr_unparse(c);
       
       
-      new = constraintExpr_makeAddConstraintExpr (c, constraintExpr_copy(add) );
+      new = constraintExpr_makeAddExpr (c, constraintExpr_copy(add) );
 
       DPRINTF((message ("Replacing %q with %q",
 			cPrint, constraintExpr_unparse(new)
@@ -350,7 +348,7 @@ static constraint  constraint_searchAndAdd (/*@returned@*/ constraint c, /*@obse
   
 }
 
-static constraintList constraintList_searchAndAdd (/*@returned@*/ constraintList list,
+/*@only@*/ static constraintList constraintList_searchAndAdd (/*@returned@*/ constraintList list,
 						   /*@observer@*/ constraintExpr find, /*@observer@*/ constraintExpr add)
 {
   constraintList newConstraints;
@@ -373,7 +371,7 @@ static constraintList constraintList_searchAndAdd (/*@returned@*/ constraintList
     }
   end_constraintList_elements;
   
-  ret =  constraintList_addList (list, newConstraints);
+  ret =  constraintList_addListFree (list, newConstraints);
   return ret;
 }
 
@@ -407,7 +405,7 @@ void forLoopHeuristics( exprNode e, exprNode forPred, exprNode forBody)
   
   iterations = getForTimes (forPred, forBody );
 
-  if (iterations)
+  if (iterations != NULL)
     {
       doAdjust ( e, forPred, forBody, iterations);
       constraintExpr_free(iterations);