X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/293f64574aef0e51a16ed3ba8187c650765dfd99..3736e0252d96679e19cfbe41f3c09833d3734386:/src/surf/surf_routing_full.c diff --git a/src/surf/surf_routing_full.c b/src/surf/surf_routing_full.c index 60dff10a57..cc9c5419c1 100644 --- a/src/surf/surf_routing_full.c +++ b/src/surf/surf_routing_full.c @@ -156,7 +156,7 @@ void model_full_end(AS_t current_routing) } } -static int surf_pointer_resource_cmp(const void *a, const void *b) { +static int full_pointer_resource_cmp(const void *a, const void *b) { return a != b; } @@ -193,7 +193,7 @@ void model_full_set_route(AS_t rc, const char *src, xbt_assert(!xbt_dynar_compare( (void*)TO_ROUTE_FULL(*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) full_pointer_resource_cmp), "The route between \"%s\" and \"%s\" already exists. If you are trying to define a reverse route, you must set the symmetrical=no attribute to your routes tags.", src,dst); } else @@ -237,7 +237,7 @@ void model_full_set_route(AS_t rc, const char *src, xbt_assert(!xbt_dynar_compare( (void*)TO_ROUTE_FULL(*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) full_pointer_resource_cmp), "The route between \"%s\" and \"%s\" already exists", src,dst); } else @@ -251,6 +251,4 @@ void model_full_set_route(AS_t rc, const char *src, xbt_dynar_shrink(TO_ROUTE_FULL(*dst_id, *src_id)->link_list, 0); } } - - generic_free_route((route_t)route) ; }