X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0acafc02f2b8ad275861e752f8cb6833c37e4c42..8dc7a3bb3f1aaa0fabb9a2acc22c32483f662bab:/src/surf/network.c?ds=sidebyside

diff --git a/src/surf/network.c b/src/surf/network.c
index 9fb8024bee..531dbbbe58 100644
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -188,13 +188,6 @@ static void parse_route_set_route(void)
 static void parse_file(const char *file)
 {
   int i;
-/*
-  surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
-  surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init);
-  surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints);
-  surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &parse_route_elem);
-  surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route);
-*/
   /* Figuring out the network links */
   surf_parse_reset_parser();
   surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init);
@@ -544,7 +537,7 @@ static double get_link_latency(const void *link)
   return ((link_CM02_t) link)->lat_current;
 }
 
-static xbt_dict_t get_link_property_list(void *link)
+static xbt_dict_t get_properties(void *link)
 {
  return ((link_CM02_t) link)->properties;
 }
@@ -674,8 +667,8 @@ static void surf_network_model_init_internal(void)
       get_link_bandwidth;
   surf_network_model->extension_public->get_link_latency =
       get_link_latency;
-  /*for the props of the link*/
-  surf_network_model->common_public->get_link_properties =  get_link_property_list;
+
+  surf_network_model->common_public->get_properties =  get_properties;
 
   link_set = xbt_dict_new();
   network_card_set = xbt_dict_new();