Fixed library dump support so that buffer constraint annotations are read and written...

[splint.git] / src / forjunk.c

diff --git a/src/forjunk.c b/src/forjunk.c
index 5914583322b7645e0ec6b7ebd67d797fe1264541..861d400e27d5e3df31f88b679495ad21f5a6d133 100644 (file)
--- 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)
@@ -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);