From 073bd7638f58304c2c358430e288bcf85dbf4516 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 10 Nov 2011 11:02:14 +0100 Subject: [PATCH] kill an unused structure + reindent and cosmetics --- src/surf/surf_routing_dijkstra.c | 2 +- src/surf/surf_routing_none.c | 30 +++++++++++------------------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/src/surf/surf_routing_dijkstra.c b/src/surf/surf_routing_dijkstra.c index 82f192495b..4d0ed98553 100644 --- a/src/surf/surf_routing_dijkstra.c +++ b/src/surf/surf_routing_dijkstra.c @@ -11,7 +11,7 @@ extern routing_global_t global_routing; extern routing_component_t current_routing; extern model_type_t current_routing_model; -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf -- dijkstra routing logic"); typedef struct { s_routing_component_t generic_routing; diff --git a/src/surf/surf_routing_none.c b/src/surf/surf_routing_none.c index 8d008d744a..025dec03c8 100644 --- a/src/surf/surf_routing_none.c +++ b/src/surf/surf_routing_none.c @@ -14,10 +14,6 @@ extern model_type_t current_routing_model; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_none, surf, "Routing part of surf"); /* Routing model structure */ -typedef struct { - s_routing_component_t generic_routing; -} s_routing_component_none_t, *routing_component_none_t; - /* Business methods */ static xbt_dynar_t none_get_onelink_routes(routing_component_t rc) { @@ -55,20 +51,16 @@ static void none_set_autonomous_system(routing_component_t rc, /* Creation routing model functions */ routing_component_t model_none_create(void) { - routing_component_none_t new_component = - xbt_new0(s_routing_component_none_t, 1); - new_component->generic_routing.set_processing_unit = - none_set_processing_unit; - new_component->generic_routing.set_autonomous_system = - none_set_autonomous_system; - new_component->generic_routing.set_route = NULL; - new_component->generic_routing.set_ASroute = NULL; - new_component->generic_routing.set_bypassroute = NULL; - new_component->generic_routing.get_route = none_get_route; - new_component->generic_routing.get_onelink_routes = - none_get_onelink_routes; - new_component->generic_routing.get_bypass_route = none_get_bypass_route; - new_component->generic_routing.finalize = none_finalize; - return (routing_component_t) new_component; + routing_component_t new_component = xbt_new(s_routing_component_t, 1); + new_component->set_processing_unit = none_set_processing_unit; + new_component->set_autonomous_system = none_set_autonomous_system; + new_component->set_route = NULL; + new_component->set_ASroute = NULL; + new_component->set_bypassroute = NULL; + new_component->get_route = none_get_route; + new_component->get_onelink_routes = none_get_onelink_routes; + new_component->get_bypass_route = none_get_bypass_route; + new_component->finalize = none_finalize; + return new_component; } -- 2.20.1