Factorize the code of model->action_state_set where possible

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

diff --git a/src/surf/network_constant.c b/src/surf/network_constant.c
index 9b63352..96b3485 100644 (file)
--- a/src/surf/network_constant.c
+++ b/src/surf/network_constant.c
@@ -111,13 +111,6 @@ static void action_recycle(surf_action_t action)
   return;
 }
 
-static void netcst_action_state_set(surf_action_t action,
-                                e_surf_action_state_t state)
-{
-  surf_action_state_set(action, state);
-  return;
-}
-
 static double share_resources(double now)
 {
   surf_action_network_Constant_t action = NULL;
@@ -157,11 +150,11 @@ static void update_actions_state(double now, double delta)
 
     if (action->generic_action.remains <= 0) {
       action->generic_action.finish = surf_get_clock();
-      netcst_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
+      surf_network_model->action_state_set((surf_action_t) action, SURF_ACTION_DONE);
     } else if ((action->generic_action.max_duration != NO_MAX_DURATION) &&
                (action->generic_action.max_duration <= 0)) {
       action->generic_action.finish = surf_get_clock();
-      netcst_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
+      surf_network_model->action_state_set((surf_action_t) action, SURF_ACTION_DONE);
     }
   }
 
@@ -284,7 +277,6 @@ static void surf_network_model_init_internal(void)
   surf_network_model->action_use = action_use;
   surf_network_model->action_cancel = action_cancel;
   surf_network_model->action_recycle = action_recycle;
-  surf_network_model->action_state_set = netcst_action_state_set;
 
   surf_network_model->model_private->resource_used = resource_used;
   surf_network_model->model_private->share_resources = share_resources;