X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f96c4337f949604e5d4e4b30f3ff6418ddf831ee..fc2d578697d0c72bab738d4b0485fbb477980036:/src/surf/surf_routing_floyd.c diff --git a/src/surf/surf_routing_floyd.c b/src/surf/surf_routing_floyd.c index be0e83e33c..95292f8b33 100644 --- a/src/surf/surf_routing_floyd.c +++ b/src/surf/surf_routing_floyd.c @@ -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,15 +333,15 @@ 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 { if(route->dst_gateway && route->src_gateway) { - char *gw_src = xbt_strdup(route->src_gateway); - char *gw_dst = xbt_strdup(route->dst_gateway); + char *gw_src = route->src_gateway; + char *gw_dst = route->dst_gateway; route->src_gateway = gw_dst; route->dst_gateway = gw_src; }