kill all free_string functions declared locally to cleanup dynars afterward, and...

[simgrid.git] / src / surf / workstation_ptask_L07.c

diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c
index 6c68352..ec0c05e 100644 (file)
--- a/src/surf/workstation_ptask_L07.c
+++ b/src/surf/workstation_ptask_L07.c
@@ -361,7 +361,7 @@ static void update_actions_state(double now, double delta)
 
 static void update_resource_state(void *id,
                                  tmgr_trace_event_t event_type,
-                                 double value)
+                                 double value, double date)
 {
   cpu_L07_t cpu = id;
   link_L07_t nw_link = id;
@@ -378,8 +378,8 @@ static void update_resource_state(void *id,
       lmm_element_t elem = NULL;
 
       nw_link->lat_current = value;
-      while (var = lmm_get_var_from_cnst
-            (ptask_maxmin_system, nw_link->constraint, &elem)) {
+      while ((var = lmm_get_var_from_cnst
+            (ptask_maxmin_system, nw_link->constraint, &elem))) {
        
 
        action = lmm_variable_id(var);
@@ -869,7 +869,7 @@ static void parse_route_set_endpoints(void)
 
   route_action = A_surfxml_route_action;
 
-  route_link_list = xbt_dynar_new(sizeof(char*), &free_string);
+  route_link_list = xbt_dynar_new(sizeof(char*), &xbt_free_ref);
 }
 
 static void parse_route_set_route(void)