X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/293f64574aef0e51a16ed3ba8187c650765dfd99..edde8f7fbc1b74a81551bf9eb7bac1935b999296:/src/surf/surf_routing_floyd.c

diff --git a/src/surf/surf_routing_floyd.c b/src/surf/surf_routing_floyd.c
index a4e1fa3609..e094d6cc7c 100644
--- a/src/surf/surf_routing_floyd.c
+++ b/src/surf/surf_routing_floyd.c
@@ -152,8 +152,8 @@ static void floyd_finalize(AS_t rc)
     xbt_dict_free(&(as->generic_routing.to_index));
     /* Delete dictionary index dict, predecessor and links table */
     xbt_free(as->predecessor_table);
-    /* Delete structure */
-    xbt_free(rc);
+
+    model_generic_finalize(rc);
   }
 }
 
@@ -231,7 +231,7 @@ void model_floyd_end(AS_t current_routing)
 	}
 }
 
-static int surf_pointer_resource_cmp(const void *a, const void *b) {
+static int floyd_pointer_resource_cmp(const void *a, const void *b) {
   return a != b;
 }
 
@@ -288,7 +288,7 @@ void model_floyd_parse_route(AS_t rc, const char *src,
 		xbt_assert(!xbt_dynar_compare(
 			  (void*)TO_FLOYD_LINK(*src_id, *dst_id)->link_list,
 			  (void*)link_route_to_test,
-			  (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
+			  (int_f_cpvoid_cpvoid_t) floyd_pointer_resource_cmp),
 			  "The route between \"%s\" and \"%s\" already exists", src,dst);
 	}
 	else
@@ -333,7 +333,7 @@ void model_floyd_parse_route(AS_t rc, const char *src,
 			xbt_assert(!xbt_dynar_compare(
 				  (void*)TO_FLOYD_LINK(*dst_id, *src_id)->link_list,
 			      (void*)link_route_to_test,
-				  (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
+				  (int_f_cpvoid_cpvoid_t) floyd_pointer_resource_cmp),
 				  "The route between \"%s\" and \"%s\" already exists", src,dst);
 		}
 		else