X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4353399a03731d894b4127bdc317f18a5db7f1b3..af80eb49a15d417e40f06e0d58b74f24052d2c24:/src/surf/network.c

diff --git a/src/surf/network.c b/src/surf/network.c
index c2ed3ea90d..50de0dd5cc 100644
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -98,7 +98,7 @@ static int network_card_new(const char *card_name)
   if (!card) {
     card = xbt_new0(s_network_card_CM02_t, 1);
     card->name = xbt_strdup(card_name);
-    card->id = card_number++;
+    card->id = host_number++;
     xbt_dict_set(network_card_set, card_name, card, network_card_free);
   }
   return card->id;
@@ -162,7 +162,7 @@ static void parse_route_set_endpoints(void)
   src_id = network_card_new(A_surfxml_route_src);
   dst_id = network_card_new(A_surfxml_route_dst);
   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)
@@ -217,6 +217,7 @@ static void add_route(void)
 
     src_id = strtol(xbt_dynar_get_as(keys, 0, char*), &end, 16);
     dst_id = strtol(xbt_dynar_get_as(keys, 1, char*), &end, 16);
+    xbt_dynar_free(&keys);
  
     xbt_dynar_foreach (links, cpt, link) {
       TRY {
@@ -694,14 +695,14 @@ static void finalize(void)
   surf_network_model = NULL;
 
   loopback = NULL;
-  for (i = 0; i < card_number; i++)
-    for (j = 0; j < card_number; j++)
+  for (i = 0; i < host_number; i++)
+    for (j = 0; j < host_number; j++)
       free(ROUTE(i, j));
   free(routing_table);
   routing_table = NULL;
   free(routing_table_size);
   routing_table_size = NULL;
-  card_number = 0;
+  host_number = 0;
 }
 
 static void surf_network_model_init_internal(void)