please sonar by removing useless asignments and return statements

[simgrid.git] / src / instr / instr_resource_utilization.cpp

diff --git a/src/instr/instr_resource_utilization.cpp b/src/instr/instr_resource_utilization.cpp
index 29e3620..c7b0bcd 100644 (file)
--- a/src/instr/instr_resource_utilization.cpp
+++ b/src/instr/instr_resource_utilization.cpp
@@ -21,7 +21,9 @@ static void __TRACE_surf_check_variable_set_to_zero(double now, const char *vari
    */
 
   // create a key considering the resource and variable
-  char *key = bprintf ("%s%s", resource, variable);
+  int n = strlen(variable)+strlen(resource)+1;
+  char *key = (char*)xbt_malloc(n*sizeof(char));
+  snprintf (key, n, "%s%s", resource, variable);
 
   // check if key exists: if it doesn't, set the variable to zero and mark this in the dict
   if (!xbt_dict_get_or_null(platform_variables, key)) {
@@ -69,7 +71,6 @@ void TRACE_surf_link_set_utilization(const char *resource, const char *category,
     type_t type = PJ_type_get (category_type, container->type);
     instr_event (now, delta, type, container, value);
   }
-  return;
 }
 
 /* TRACE_surf_host_set_utilization: entry point from SimGrid */
@@ -77,9 +78,7 @@ void TRACE_surf_host_set_utilization(const char *resource, const char *category,
 {
   //only trace host utilization if host is known by tracing mechanism
   container_t container = PJ_container_get_or_null(resource);
-  if (!container)
-    return;
-  if (!value)
+  if (!container || !value)
     return;
 
   //trace uncategorized host utilization
@@ -100,7 +99,6 @@ void TRACE_surf_host_set_utilization(const char *resource, const char *category,
     type_t type = PJ_type_get (category_type, container->type);
     instr_event (now, delta, type, container, value);
   }
-  return;
 }
 
 void TRACE_surf_resource_utilization_alloc()