Remove two more declaration of phantom functions.

[simgrid.git] / src / surf / surf_routing.c

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 7ad72d3..05a90c6 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -50,7 +50,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
 static void routing_parse_peer(sg_platf_peer_cbarg_t peer);     /* peer bypass */
 static void routing_parse_Srandom(void);        /* random bypass */
 
-static char *replace_random_parameter(char *chaine);
 static void routing_parse_postparse(void);
 
 /* this lines are only for replace use like index in the model table */
@@ -100,7 +99,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);
 
-  (*(current_routing->parse_PU)) (current_routing, host->id);
+  current_routing->parse_PU(current_routing, host->id);
   info = xbt_new0(s_network_element_info_t, 1);
   info->rc_component = current_routing;
   info->rc_type = SURF_NETWORK_ELEMENT_HOST;
@@ -127,7 +126,7 @@ static void parse_S_router(sg_platf_router_cbarg_t router)
              "Reading a router, processing unit \"%s\" already exists",
              router->id);
 
-  (*(current_routing->parse_PU)) (current_routing, router->id);
+  current_routing->parse_PU(current_routing, router->id);
   info = xbt_new0(s_network_element_info_t, 1);
   info->rc_component = current_routing;
   info->rc_type = SURF_NETWORK_ELEMENT_ROUTER;
@@ -231,7 +230,7 @@ static void routing_parse_E_route(void)
   xbt_assert(current_routing->parse_route,
              "no defined method \"set_route\" in \"%s\"",
              current_routing->name);
-  (*(current_routing->parse_route)) (current_routing, src, dst, route);
+  current_routing->parse_route(current_routing, src, dst, route);
   link_list = NULL;
   src = NULL;
   dst = NULL;
@@ -249,7 +248,7 @@ static void routing_parse_E_ASroute(void)
   xbt_assert(current_routing->parse_ASroute,
              "no defined method \"set_ASroute\" in \"%s\"",
              current_routing->name);
-  (*(current_routing->parse_ASroute)) (current_routing, src, dst, e_route);
+  current_routing->parse_ASroute(current_routing, src, dst, e_route);
   link_list = NULL;
   src = NULL;
   dst = NULL;
@@ -269,7 +268,7 @@ static void routing_parse_E_bypassRoute(void)
   xbt_assert(current_routing->parse_bypassroute,
              "Bypassing mechanism not implemented by routing '%s'",
              current_routing->name);
-  (*(current_routing->parse_bypassroute)) (current_routing, src, dst, e_route);
+  current_routing->parse_bypassroute(current_routing, src, dst, e_route);
   link_list = NULL;
   src = NULL;
   dst = NULL;
@@ -311,7 +310,7 @@ void routing_AS_begin(const char *AS_id, const char *wanted_routing_type)
   }
 
   /* make a new routing component */
-  new_as = (AS_t) (*(model->create)) ();
+  new_as = (AS_t) model->create();
   new_as->model_desc = model;
   new_as->hierarchy = SURF_ROUTING_NULL;
   new_as->name = xbt_strdup(AS_id);
@@ -336,7 +335,7 @@ void routing_AS_begin(const char *AS_id, const char *wanted_routing_type)
     xbt_dict_set(current_routing->routing_sons, AS_id,
                  (void *) new_as, NULL);
     /* add to the father element list */
-    (*(current_routing->parse_AS)) (current_routing, AS_id);
+    current_routing->parse_AS(current_routing, AS_id);
   } else {
     THROWF(arg_error, 0, "All defined components must be belong to a AS");
   }
@@ -372,7 +371,7 @@ void routing_AS_end()
                 (void *) info);
 
     if (current_routing->model_desc->end)
-      (*(current_routing->model_desc->end)) (current_routing);
+      current_routing->model_desc->end(current_routing);
     current_routing = current_routing->routing_father;
   }
 }