X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a11867d76b2e3254878108fe0b83111be8cd2def..8d777265e12b0b9c5f13fecfc719474cdd214e9e:/src/surf/platf_generator.c diff --git a/src/surf/platf_generator.c b/src/surf/platf_generator.c index fadf745abb..65c9a3dc81 100644 --- a/src/surf/platf_generator.c +++ b/src/surf/platf_generator.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2012, 2014. The SimGrid Team. +/* Copyright (c) 2012, 2014-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -399,7 +399,6 @@ int platf_graph_is_connected(void) { do { //Get the next node xbt_dynar_get_cpy(connected_nodes, iterator, &graph_node); - node_data = xbt_graph_node_get_data(graph_node); //add all the linked nodes to the connected node array outgoing_edges = xbt_graph_node_get_outedges(graph_node); @@ -448,7 +447,7 @@ void platf_graph_clear_links(void) { } //Delete edges from the graph xbt_dynar_foreach(dynar_edges_cpy, i, graph_edge) { - xbt_graph_free_edge(platform_graph, graph_edge, xbt_free); + xbt_graph_free_edge(platform_graph, graph_edge, xbt_free_f); } //remove the dynar copy xbt_dynar_free(&dynar_edges_cpy); @@ -617,8 +616,8 @@ void platf_generate(void) { sg_platf_host_cbarg_t host_parameters; sg_platf_cluster_cbarg_t cluster_parameters; sg_platf_link_cbarg_t link_parameters; - s_sg_platf_router_cbarg_t router_parameters; /* This one is not a pointer! */ - s_sg_platf_route_cbarg_t route_parameters; /* neither this one! */ + s_sg_platf_router_cbarg_t router_parameters = SG_PLATF_ROUTER_INITIALIZER; /* This one is not a pointer! */ + s_sg_platf_route_cbarg_t route_parameters = SG_PLATF_ROUTE_INITIALIZER; /* neither this one! */ router_parameters.coord = NULL; route_parameters.symmetrical = FALSE;