made strncat use size_t

[splint.git] / src / constraintGeneration.c

diff --git a/src/constraintGeneration.c b/src/constraintGeneration.c
index 11f978e1d8d4387aa31a0145b717d85324d7039a..251ce53ebe2298cf362a6f21df452fa68db48038 100644 (file)
--- a/src/constraintGeneration.c
+++ b/src/constraintGeneration.c
@@ -74,7 +74,7 @@ static bool exprNode_isUnhandled (/*@dependent@*/ /*@obsever@*/ exprNode e)
     case XPR_TOK:
     case XPR_FTDEFAULT:
     case XPR_DEFAULT:
-    case XPR_SWITCH:
+      //    case XPR_SWITCH:
     case XPR_FTCASE:
     case XPR_CASE:
       //    case XPR_INIT:
@@ -111,12 +111,6 @@ bool /*@alt void@*/ exprNode_generateConstraints (/*@dependent@*/ exprNode e)
 {
   if (exprNode_isError (e) )
     return FALSE;
-  /*
-  e->requiresConstraints = constraintList_makeNew();
-  e->ensuresConstraints = constraintList_makeNew();
-  e->trueEnsuresConstraints = constraintList_makeNew();
-  e->falseEnsuresConstraints = constraintList_makeNew();
-  */
 
   if (exprNode_isUnhandled (e) )
     {
@@ -180,6 +174,7 @@ if (exprNode_handleError (e) != NULL)
     case XPR_BLOCK:
     case XPR_STMT:
     case XPR_STMTLIST:
+    case XPR_SWITCH:
       return TRUE;
     default:
       return FALSE;
@@ -571,17 +566,23 @@ static exprNode doSwitch (/*@returned@*/ exprNode e)
   exprData data;
 
   data = e->edata;
-  llassert(FALSE);
-  //DPRINTF (( message ("doSwitch for: switch (%s) %s", 
-  //        exprNode_unparse (exprData_getPairA (data)),
-  //                exprNode_unparse (exprData_getPairB (data))) ));
-
+  //  llassert(FALSE);
+  DPRINTF (( message ("doSwitch for: switch (%s) %s", 
+                     exprNode_unparse (exprData_getPairA (data)),
+                     exprNode_unparse (exprData_getPairB (data))) ));
+  
   body = exprData_getPairB (data);
   
-  // exprNode_generateConstraints(body);
+  exprNode_generateConstraints(body);
+  
+  constraintList_free(e->requiresConstraints);
+  constraintList_free(e->ensuresConstraints);
   
-  // e->requiresConstraints = constraintList_copy ( body->requiresConstraints );
-  //e->ensuresConstraints = constraintList_copy ( body->ensuresConstraints );
+  e->requiresConstraints = NULL;
+  e->ensuresConstraints  = NULL;
+
+  e->requiresConstraints = constraintList_copy ( body->requiresConstraints );
+  e->ensuresConstraints = constraintList_copy ( body->ensuresConstraints );
   
   return e;
 }
@@ -885,10 +886,10 @@ if (lltok_isLe_Op (tok) )
      tempList = constraintList_addList (tempList, t2->falseEnsuresConstraints);
      temp = tempList;
      tempList = constraintList_logicalOr (tempList, t1->falseEnsuresConstraints);
-     constraintList_free(temp);
-
-      e->falseEnsuresConstraints =constraintList_addList(e->falseEnsuresConstraints, tempList);
-      
+     constraintList_free (temp);
+     
+     /* evans - was constraintList_addList - memory leak detected by lclint */
+     e->falseEnsuresConstraints =constraintList_addListFree (e->falseEnsuresConstraints, tempList);
    }
  else if (lltok_isOr_Op (tok) )
   {
@@ -905,17 +906,13 @@ if (lltok_isLe_Op (tok) )
       tempList = constraintList_logicalOr (tempList, t1->trueEnsuresConstraints);
       constraintList_free(temp);
 
-
-      e->trueEnsuresConstraints =constraintList_addListFree(e->trueEnsuresConstraints, tempList);
+      e->trueEnsuresConstraints = constraintList_addListFree(e->trueEnsuresConstraints, tempList);
       tempList = constraintList_undefined;
-
-      
     }
  else
     {
       DPRINTF((message("%s is not a boolean operation", lltok_unparse(tok) ) ));
-    }
-  
+    } 
 }
 
 void exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  /*@observer@*/ /*@temp@*/ fileloc sequencePoint)
@@ -1353,14 +1350,14 @@ constraintList exprNode_traversTrueEnsuresConstraints (exprNode e)
   exprData data;
   constraintList ret;
 
-   if (exprNode_handleError (e))
-     {
-       ret = constraintList_makeNew();
-       return ret;
-     }
+  if (exprNode_handleError (e))
+    {
+      ret = constraintList_makeNew();
+      return ret;
+    }
   ret = constraintList_copy (e->trueEnsuresConstraints );
    
-   handledExprNode = TRUE;
+  handledExprNode = TRUE;
    
   data = e->edata;
   
@@ -1392,6 +1389,14 @@ constraintList exprNode_traversTrueEnsuresConstraints (exprNode e)
       ret = constraintList_addListFree (ret, exprNode_traversTrueEnsuresConstraints
                                    (exprData_getUopNode (data) ) );
       break;
+
+    case XPR_INIT:
+      ret = constraintList_addListFree (ret,
+                                       exprNode_traversTrueEnsuresConstraints
+                                       (exprData_getInitNode (data) ) );
+       break;
+
+
     case XPR_ASSIGN:
         ret = constraintList_addListFree (ret,
                                    exprNode_traversTrueEnsuresConstraints
@@ -1530,6 +1535,12 @@ constraintList exprNode_traversFalseEnsuresConstraints (exprNode e)
       ret = constraintList_addListFree (ret, exprNode_traversFalseEnsuresConstraints
                                    (exprData_getUopNode (data) ) );
       break;
+    case XPR_INIT:
+        ret = constraintList_addListFree (ret,
+                                   exprNode_traversFalseEnsuresConstraints
+                                   (   exprData_getInitNode (data) ) );
+       break;
+
     case XPR_ASSIGN:
         ret = constraintList_addListFree (ret,
                                    exprNode_traversFalseEnsuresConstraints
@@ -1670,6 +1681,12 @@ constraintList exprNode_traversFalseEnsuresConstraints (exprNode e)
       ret = constraintList_addListFree (ret, exprNode_traversRequiresConstraints
                                    (exprData_getUopNode (data) ) );
       break;
+    case XPR_INIT:
+      ret = constraintList_addListFree (ret,
+                                       exprNode_traversRequiresConstraints
+                                       (exprData_getInitNode (data) ) );
+       break;
+
     case XPR_ASSIGN:
         ret = constraintList_addListFree (ret,
                                    exprNode_traversRequiresConstraints
@@ -1821,6 +1838,14 @@ constraintList exprNode_traversFalseEnsuresConstraints (exprNode e)
       ret = constraintList_addListFree (ret, exprNode_traversEnsuresConstraints
                                    (exprData_getUopNode (data) ) );
       break;
+      
+    case XPR_INIT:
+      ret = constraintList_addListFree (ret,
+                                       exprNode_traversEnsuresConstraints
+                                       (exprData_getInitNode (data) ) );
+       break;
+
+
     case XPR_ASSIGN:
         ret = constraintList_addListFree (ret,
                                    exprNode_traversEnsuresConstraints