X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/blobdiff_plain/4ab867d67e2c0f7c57d0e4e1678c4fec7ea9db12..2934b455c4074408a0f819009c071456f021ba21:/src/constraintResolve.c

diff --git a/src/constraintResolve.c b/src/constraintResolve.c
index f263d42..de80027 100644
--- 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);