X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/74eba548bff1168594c39c3b483ee6db94acd808..8a63264af07173eaba26c404f4e647cc9a9c584e:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 4f5b42a8d9..69949a6352 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -2509,7 +2509,7 @@ static void generic_set_route(routing_component_t rc, const char *src, route_t route_to_test = xbt_dict_get_or_null(_parse_routes, route_name); if(route_to_test) - xbt_assert2(xbt_dynar_compare( + xbt_assert2(!xbt_dynar_compare( (void*)route->link_list, (void*)route_to_test->link_list, (int_f_cpvoid_cpvoid_t) strcmp), @@ -2526,13 +2526,13 @@ static void generic_set_route(routing_component_t rc, const char *src, for(i=nb_links ; i>0 ; i--) { char *link_name = xbt_new0(char,strlen(xbt_dynar_get_as(route->link_list, i-1, char *))); - link_name = bprintf("%s",xbt_dynar_get_as(route->link_list, i-1, char *)); + link_name = xbt_strdup(xbt_dynar_get_as(route->link_list, i-1, char *)); xbt_dynar_push_as(route_sym->link_list ,char *, link_name); } DEBUG2("Load Route from \"%s\" to \"%s\"", dst, src); route_to_test = xbt_dict_get_or_null(_parse_routes, bprintf("%d#%d",*dst_id, *src_id)); if(route_to_test) - xbt_assert2(xbt_dynar_compare( + xbt_assert2(!xbt_dynar_compare( (void*)route_sym->link_list, (void*)route_to_test->link_list, (int_f_cpvoid_cpvoid_t) strcmp), @@ -2568,7 +2568,7 @@ static void generic_set_ASroute(routing_component_t rc, const char *src, route_t route_to_test = xbt_dict_get_or_null(_parse_routes, route_name); if(route_to_test) - xbt_assert4(xbt_dynar_compare( + xbt_assert4(!xbt_dynar_compare( (void*) (&e_route->generic_route)->link_list, (void*) route_to_test->link_list, (int_f_cpvoid_cpvoid_t) strcmp), @@ -2598,7 +2598,7 @@ static void generic_set_ASroute(routing_component_t rc, const char *src, route_to_test = xbt_dict_get_or_null(_parse_routes, bprintf("%d#%d", *dst_id, *src_id)); if(route_to_test) - xbt_assert4(xbt_dynar_compare( + xbt_assert4(!xbt_dynar_compare( (void*) (&route_sym->generic_route)->link_list, (void*) route_to_test->link_list, (int_f_cpvoid_cpvoid_t) strcmp),