From: navarro Date: Thu, 6 Sep 2012 13:29:37 +0000 (+0200) Subject: Cosmetics. (Forgot from a previous renaming) X-Git-Tag: v3_8~146^2~85 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7f33377240ba1d62c648e480ca94be6298cdf8a4 Cosmetics. (Forgot from a previous renaming) --- diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index 399bc2adcd..6588dabb85 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -132,8 +132,7 @@ typedef struct s_routing_edge { e_surf_network_element_type_t rc_type; int id; char *name; - xbt_dict_t properties; -} s_network_element_t; +} s_routing_edge_t; /* * Link of lenght 1, alongside with its source and destination. This is mainly usefull in the bindings to gtnets and ns3 diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 732dc77fa6..e25114f081 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -148,7 +148,7 @@ static void parse_S_host(sg_platf_host_cbarg_t host) xbt_assert(!xbt_lib_get_or_null(host_lib, host->id, ROUTING_HOST_LEVEL), "Reading a host, processing unit \"%s\" already exists", host->id); - info = xbt_new0(s_network_element_t, 1); + info = xbt_new0(s_routing_edge_t, 1); info->rc_component = current_routing; info->rc_type = SURF_NETWORK_ELEMENT_HOST; info->name = xbt_strdup(host->id); @@ -193,7 +193,7 @@ static void parse_S_router(sg_platf_router_cbarg_t router) "Reading a router, processing unit \"%s\" already exists", router->id); - info = xbt_new0(s_network_element_t, 1); + info = xbt_new0(s_routing_edge_t, 1); info->rc_component = current_routing; info->rc_type = SURF_NETWORK_ELEMENT_ROUTER; info->name = xbt_strdup(router->id); @@ -365,7 +365,7 @@ void routing_AS_begin(sg_platf_AS_cbarg_t AS) new_as->name = xbt_strdup(AS->id); sg_routing_edge_t info = NULL; - info = xbt_new0(s_network_element_t, 1); + info = xbt_new0(s_routing_edge_t, 1); if (current_routing == NULL && routing_platf->root == NULL) {