Merged with Dave Evans's changes.

[splint.git] / src / constraintResolve.c

diff --git a/src/constraintResolve.c b/src/constraintResolve.c
index f263d42b11f379a235671bc0c78f74e779f2967d..de80027b29636402b2608f04549b011ff98af443 100644 (file)
--- a/src/constraintResolve.c
+++ b/src/constraintResolve.c
@@ -14,7 +14,6 @@
 # include "exprChecks.h"
 # include "aliasChecks.h"
 # include "exprNodeSList.h"
-//# include "exprData.i"
 
 
 /*@access constraint, exprNode @*/
@@ -457,12 +456,12 @@ static /*@only@*/ constraint doResolveOr (constraint c, constraintList post1, /*
 
   if (*resolved)
     {
-      if (next)
+      if (next != NULL)
        constraint_free(next);
 
-      /*we don't need to free ret is resolved is false*/
+      /*we don't need to free ret when resolved is false*/
       //      constraint_free(ret);
-      return NULL;
+      /*@i1*/ return NULL;
     }
 
   while (next != NULL)
@@ -477,10 +476,10 @@ static /*@only@*/ constraint doResolveOr (constraint c, constraintList post1, /*
          /* curr is null so we don't try to free it*/
          //constraint_free(curr);
          
-         if (next)
+         if (next != NULL)
            constraint_free(next);
          constraint_free(ret);
-         return NULL;
+         /*@i1*/ return NULL;
        }
       ret = constraint_addOr (ret, curr);
       constraint_free(curr);
@@ -1088,7 +1087,6 @@ return ret;
   constraintList_elements(target, el)
   { 
     constraint temp;
-    #warning make sure this side effect is the right things
     #warning make sure that a side effect is not expected
 
     temp = substitute(el, subList);