Avoid const cast (sonar).

There is apparently no need for a fake argv[0].

diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp
index faf6477..e6aa819 100644 (file)
--- a/src/s4u/s4u_Engine.cpp
+++ b/src/s4u/s4u_Engine.cpp
@@ -64,9 +64,9 @@ Engine::~Engine()
 /** @brief Retrieve the engine singleton */
 Engine* Engine::get_instance()
 {
-  int argc      = 0;
-  char* argv[2] = {const_cast<char*>("noname"), nullptr};
-  return get_instance(&argc, argv);
+  int argc   = 0;
+  char* argv = nullptr;
+  return get_instance(&argc, &argv);
 }
 Engine* Engine::get_instance(int* argc, char** argv)
 {

diff --git a/src/xbt/xbt_main.cpp b/src/xbt/xbt_main.cpp
index 66f95e3..41ae101 100644 (file)
--- a/src/xbt/xbt_main.cpp
+++ b/src/xbt/xbt_main.cpp
@@ -125,7 +125,8 @@ void xbt_init(int *argc, char **argv)
 
   simgrid::xbt::install_exception_handler();
 
-  simgrid::xbt::binary_name = argv[0];
+  if (*argc > 0)
+    simgrid::xbt::binary_name = argv[0];
   for (int i = 0; i < *argc; i++)
     simgrid::xbt::cmdline.emplace_back(argv[i]);