Cleanups suggested by eclipse.

diff --git a/src/surf/cpu_cas01.c b/src/surf/cpu_cas01.c
index 3e345d2..d8c3b4d 100644 (file)
--- a/src/surf/cpu_cas01.c
+++ b/src/surf/cpu_cas01.c
@@ -598,8 +598,8 @@ static double cpu_action_get_remains(surf_action_t action)
   /* update remains before return it */
   if(cpu_update_mechanism == UM_LAZY)
     cpu_update_remains(ACTION_GET_CPU(action), surf_get_clock());
-  return action->remains;
   XBT_OUT();
+  return action->remains;
 }
 
 static e_surf_resource_state_t cpu_get_state(void *cpu)

diff --git a/src/surf/cpu_ti.c b/src/surf/cpu_ti.c
index ab3bad8..f8ccc17 100644 (file)
--- a/src/surf/cpu_ti.c
+++ b/src/surf/cpu_ti.c
@@ -681,8 +681,8 @@ static double cpu_ti_action_get_remains(surf_action_t action)
   cpu_ti_update_remaining_amount((cpu_ti_t)
                                  ((surf_action_cpu_ti_t) action)->cpu,
                                  surf_get_clock());
-  return action->remains;
   XBT_OUT();
+  return action->remains;
 }
 
 static e_surf_resource_state_t cpu_ti_get_state(void *cpu)

diff --git a/src/surf/network.c b/src/surf/network.c
index 24d271c..9a49b55 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -48,13 +48,11 @@ e_UM_t network_update_mechanism = UM_UNDEFINED;
 static int selective_update = 0;
 
 static int net_action_is_suspended(surf_action_t action);
-static void net_update_actions_state(double now, double delta);
 static void update_action_remaining(double now);
 
 static xbt_swag_t net_modified_set = NULL;
 static xbt_heap_t net_action_heap = NULL;
 xbt_swag_t keep_track = NULL;
-extern int sg_maxmin_selective_update;
 
 #ifdef HAVE_SMPI
 static void gap_append(double size, const link_CM02_t link, surf_action_network_CM02_t action);

diff --git a/src/surf/network_constant.c b/src/surf/network_constant.c
index 4d2fd38..62d1d01 100644 (file)
--- a/src/surf/network_constant.c
+++ b/src/surf/network_constant.c
@@ -147,16 +147,19 @@ static void netcste_action_set_category(surf_action_t action, const char *catego
 static double netcste_get_link_bandwidth(const void *link)
 {
   DIE_IMPOSSIBLE;
+  return -1.0;
 }
 
 static double netcste_get_link_latency(const void *link)
 {
   DIE_IMPOSSIBLE;
+  return -1.0;
 }
 
 static int link_shared(const void *link)
 {
   DIE_IMPOSSIBLE;
+  return -1;
 }
 
 static void netcste_action_suspend(surf_action_t action)

diff --git a/src/surf/surf_model.c b/src/surf/surf_model.c
index 028b732..3b7a960 100644 (file)
--- a/src/surf/surf_model.c
+++ b/src/surf/surf_model.c
@@ -16,6 +16,7 @@ static void void_die_impossible_paction(surf_action_t action)
 static int int_die_impossible_paction(surf_action_t action)
 {
   DIE_IMPOSSIBLE;
+  return -1;
 }
 
 /** @brief initialize common datastructures to all models */

diff --git a/src/surf/surf_routing_cluster.c b/src/surf/surf_routing_cluster.c
index 9c8e028..8400159 100644 (file)
--- a/src/surf/surf_routing_cluster.c
+++ b/src/surf/surf_routing_cluster.c
@@ -6,7 +6,6 @@
 #include "surf_routing_private.h"
 
 /* Global vars */
-extern routing_global_t global_routing;
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf");
 

diff --git a/src/surf/surf_routing_generic.c b/src/surf/surf_routing_generic.c
index 414bdd7..bfb16f9 100644 (file)
--- a/src/surf/surf_routing_generic.c
+++ b/src/surf/surf_routing_generic.c
@@ -89,6 +89,7 @@ void generic_parse_bypassroute(AS_t rc,
 
 xbt_dynar_t generic_get_onelink_routes(AS_t rc) { // FIXME: kill that stub
   xbt_die("\"generic_get_onelink_routes\" not implemented yet");
+  return NULL;
 }
 
 route_t generic_get_bypassroute(AS_t rc, const char *src, const char *dst)

diff --git a/src/surf/surf_routing_rulebased.c b/src/surf/surf_routing_rulebased.c
index ca0a8aa..b4f3765 100644 (file)
--- a/src/surf/surf_routing_rulebased.c
+++ b/src/surf/surf_routing_rulebased.c
@@ -8,7 +8,6 @@
 
 /* Global vars */
 extern routing_global_t global_routing;
-extern xbt_dynar_t parsed_link_list;
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_rulebased, surf, "Routing part of surf");
 

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 06aaa82..0187aa5 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -387,6 +387,7 @@ void ETag_surfxml_link(void){
     break;
   default:
     surf_parse_error(bprintf("invalid state for link %s",link.id));
+    break;
   }
   link.state_trace = tmgr_trace_new(A_surfxml_link_state_file);
 
@@ -402,6 +403,7 @@ void ETag_surfxml_link(void){
      break;
   default:
     surf_parse_error(bprintf("Invalid sharing policy in link %s",link.id));
+    break;
   }
 
   sg_platf_new_link(&link);

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 2106d8b..4380cf1 100644 (file)
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -50,6 +50,7 @@ void create_workstations(void)
 static int ws_resource_used(void *resource_id)
 {
   THROW_IMPOSSIBLE;             /* This model does not implement parallel tasks */
+  return -1;
 }
 
 static void ws_parallel_action_cancel(surf_action_t action)
@@ -60,6 +61,7 @@ static void ws_parallel_action_cancel(surf_action_t action)
 static int ws_parallel_action_free(surf_action_t action)
 {
   THROW_UNIMPLEMENTED;          /* This model does not implement parallel tasks */
+  return -1;
 }
 
 static int ws_action_unref(surf_action_t action)
@@ -158,6 +160,7 @@ static int ws_action_is_suspended(surf_action_t action)
   if (action->model_type == surf_cpu_model)
     return surf_cpu_model->is_suspended(action);
   DIE_IMPOSSIBLE;
+  return -1;
 }
 
 static void ws_action_set_max_duration(surf_action_t action,
@@ -210,6 +213,7 @@ static double ws_action_get_remains(surf_action_t action)
   if (action->model_type == surf_cpu_model)
     return surf_cpu_model->get_remains(action);
   DIE_IMPOSSIBLE;
+  return -1.0;
 }
 
 static surf_action_t ws_communicate(void *workstation_src,
@@ -249,6 +253,7 @@ static surf_action_t ws_execute_parallel_task(int workstation_nb,
                                               double amount, double rate)
 {
   THROW_UNIMPLEMENTED;          /* This model does not implement parallel tasks */
+  return NULL;
 }
 
 

diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c
index 952fd8a..861e404 100644 (file)
--- a/src/surf/workstation_ptask_L07.c
+++ b/src/surf/workstation_ptask_L07.c
@@ -195,8 +195,8 @@ static void ptask_action_set_priority(surf_action_t action,
 static double ptask_action_get_remains(surf_action_t action)
 {
   XBT_IN("(%p)", action);
-  return action->remains;
   XBT_OUT();
+  return action->remains;
 }
 
 /**************************************/