Avoid unsafe things

[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 42012ec..c7b0bcd 100644 (file)
--- a/src/instr/instr_resource_utilization.cpp
+++ b/src/instr/instr_resource_utilization.cpp
@@ -30,7 +30,7 @@ static void __TRACE_surf_check_variable_set_to_zero(double now, const char *vari
     container_t container = PJ_container_get (resource);
     type_t type = PJ_type_get (variable, container->type);
     new_pajeSetVariable (now, container, type, 0);
     container_t container = PJ_container_get (resource);
     type_t type = PJ_type_get (variable, container->type);
     new_pajeSetVariable (now, container, type, 0);

-    xbt_dict_set(platform_variables, key, (char*)"", NULL);
+    xbt_dict_set(platform_variables, key, (char*)"", nullptr);

   }
   xbt_free(key);
 }
   }
   xbt_free(key);
 }


@@ -71,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);
   }
     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 */
 }
 
 /* TRACE_surf_host_set_utilization: entry point from SimGrid */


@@ -79,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);
 {
   //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
     return;
 
   //trace uncategorized host utilization


@@ -102,12 +99,11 @@ 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);
   }
     type_t type = PJ_type_get (category_type, container->type);
     instr_event (now, delta, type, container, value);
   }

-  return;

 }
 
 void TRACE_surf_resource_utilization_alloc()
 {
 }
 
 void TRACE_surf_resource_utilization_alloc()
 {

-  platform_variables = xbt_dict_new_homogeneous(NULL);
+  platform_variables = xbt_dict_new_homogeneous(nullptr);

 }
 
 void TRACE_surf_resource_utilization_release()
 }
 
 void TRACE_surf_resource_utilization_release()