From efbaa7f3050b349e41f3051b751f53b0b24e111d Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 10 Nov 2011 16:08:23 +0100 Subject: [PATCH 1/1] kill a type that were exactly the same than another --- src/surf/surf_private.h | 10 ++-------- src/surf/surf_routing.c | 4 ++-- src/surf/surf_routing_dijkstra.c | 2 +- src/surf/surf_routing_floyd.c | 2 +- src/surf/surf_routing_full.c | 2 +- src/surf/surf_routing_private.h | 6 +++--- src/surf/surf_routing_rulebased.c | 4 ++-- 7 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index 766aa48aae..1ffe22ce4f 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -114,12 +114,6 @@ typedef struct s_route { xbt_dynar_t link_list; } s_route_t, *route_t; -typedef struct s_name_route_extended { - s_route_t generic_route; - char *src_gateway; - char *dst_gateway; -} s_name_route_extended_t, *name_route_extended_t; - typedef struct s_route_extended { s_route_t generic_route; char *src_gateway; @@ -157,9 +151,9 @@ typedef struct s_routing_component { void (*parse_PU) (routing_component_t rc, const char *name); /* A host or a router, whatever */ void (*parse_AS) (routing_component_t rc, const char *name); void (*parse_route) (routing_component_t rc, const char *src, - const char *dst, name_route_extended_t route); + const char *dst, route_extended_t route); void (*parse_ASroute) (routing_component_t rc, const char *src, - const char *dst, name_route_extended_t route); + const char *dst, route_extended_t route); void (*parse_bypassroute) (routing_component_t rc, const char *src, const char *dst, route_extended_t e_route); } s_routing_component_t; diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index f1be3c151e..101626c1a2 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -228,7 +228,7 @@ static void routing_parse_link_ctn(void) */ static void routing_parse_E_route(void) { - name_route_extended_t route = xbt_new0(s_name_route_extended_t, 1); + route_extended_t route = xbt_new0(s_route_extended_t, 1); route->generic_route.link_list = link_list; xbt_assert(current_routing->parse_route, "no defined method \"set_route\" in \"%s\"", @@ -244,7 +244,7 @@ static void routing_parse_E_route(void) */ static void routing_parse_E_ASroute(void) { - name_route_extended_t e_route = xbt_new0(s_name_route_extended_t, 1); + route_extended_t e_route = xbt_new0(s_route_extended_t, 1); e_route->generic_route.link_list = link_list; e_route->src_gateway = xbt_strdup(gw_src); e_route->dst_gateway = xbt_strdup(gw_dst); diff --git a/src/surf/surf_routing_dijkstra.c b/src/surf/surf_routing_dijkstra.c index 9e2fe47377..c2224b489a 100644 --- a/src/surf/surf_routing_dijkstra.c +++ b/src/surf/surf_routing_dijkstra.c @@ -501,7 +501,7 @@ void model_dijkstra_both_end(void) } void model_dijkstra_both_parse_route (routing_component_t rc, const char *src, - const char *dst, name_route_extended_t route) + const char *dst, route_extended_t route) { routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc; int *src_id, *dst_id; diff --git a/src/surf/surf_routing_floyd.c b/src/surf/surf_routing_floyd.c index fc8d664346..b478c2a04b 100644 --- a/src/surf/surf_routing_floyd.c +++ b/src/surf/surf_routing_floyd.c @@ -256,7 +256,7 @@ static int surf_pointer_resource_cmp(const void *a, const void *b) { //FIXME: kill dupplicates in next function with full routing void model_floyd_parse_route(routing_component_t rc, const char *src, - const char *dst, name_route_extended_t route) + const char *dst, route_extended_t route) { routing_component_floyd_t routing = (routing_component_floyd_t) rc; diff --git a/src/surf/surf_routing_full.c b/src/surf/surf_routing_full.c index ca3a73a30d..d8ceada316 100644 --- a/src/surf/surf_routing_full.c +++ b/src/surf/surf_routing_full.c @@ -176,7 +176,7 @@ static int surf_pointer_resource_cmp(const void *a, const void *b) { } void model_full_set_route(routing_component_t rc, const char *src, - const char *dst, name_route_extended_t route) + const char *dst, route_extended_t route) { int *src_id, *dst_id; src_id = xbt_dict_get_or_null(rc->to_index, src); diff --git a/src/surf/surf_routing_private.h b/src/surf/surf_routing_private.h index c2445cf642..152d7c22fc 100644 --- a/src/surf/surf_routing_private.h +++ b/src/surf/surf_routing_private.h @@ -65,7 +65,7 @@ void generic_src_dst_check(routing_component_t rc, const char *src, routing_component_t model_floyd_create(void); /* create structures for floyd routing model */ void model_floyd_end(void); /* finalize the creation of floyd routing model */ void model_floyd_parse_route(routing_component_t rc, const char *src, - const char *dst, name_route_extended_t route); + const char *dst, route_extended_t route); /* ************************************************** */ /* ************** RULE-BASED ROUTING **************** */ @@ -92,14 +92,14 @@ routing_component_t model_dijkstra_create(void); /* create structures for routing_component_t model_dijkstracache_create(void); /* create structures for dijkstracache routing model */ void model_dijkstra_both_end(void); /* finalize the creation of dijkstra routing model */ void model_dijkstra_both_parse_route (routing_component_t rc, const char *src, - const char *dst, name_route_extended_t route); + const char *dst, route_extended_t route); /* ************************************************************************** */ /* *************************** FULL ROUTING ********************************* */ routing_component_t model_full_create(void); /* create structures for full routing model */ void model_full_end(void); /* finalize the creation of full routing model */ void model_full_set_route( /* Set the route and ASroute between src and dst */ - routing_component_t rc, const char *src, const char *dst, name_route_extended_t route); + routing_component_t rc, const char *src, const char *dst, route_extended_t route); /* ************************************************************************** */ /* ******************************* NO ROUTING ******************************* */ diff --git a/src/surf/surf_routing_rulebased.c b/src/surf/surf_routing_rulebased.c index 00a9b88fce..aee6a7d5f9 100644 --- a/src/surf/surf_routing_rulebased.c +++ b/src/surf/surf_routing_rulebased.c @@ -86,7 +86,7 @@ static void model_rulebased_parse_AS(routing_component_t rc, static void model_rulebased_parse_route(routing_component_t rc, const char *src, const char *dst, - name_route_extended_t route) + route_extended_t route) { routing_component_rulebased_t routing = (routing_component_rulebased_t) rc; @@ -114,7 +114,7 @@ static void model_rulebased_parse_route(routing_component_t rc, static void model_rulebased_parse_ASroute(routing_component_t rc, const char *src, const char *dst, - name_route_extended_t route) + route_extended_t route) { routing_component_rulebased_t routing = (routing_component_rulebased_t) rc; -- 2.20.1