Use c++ string to parse config parameters.

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

diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp
index eb86e1d..0ab998e 100644 (file)
--- a/src/instr/instr_config.cpp
+++ b/src/instr/instr_config.cpp
@@ -142,7 +142,7 @@ int TRACE_end()
     TRACE_paje_dump_buffer(true);
 
     /* destroy all data structures of tracing (and free) */
-    delete PJ_container_get_root();
+    delete simgrid::instr::Container::getRootContainer();
     delete simgrid::instr::Type::getRootType();
     rootType = nullptr;
 
@@ -356,11 +356,10 @@ void TRACE_global_init()
 
 static void print_line (const char *option, const char *desc, const char *longdesc, int detailed)
 {
-  char str[INSTR_DEFAULT_STR_SIZE];
-  snprintf (str, INSTR_DEFAULT_STR_SIZE, "--cfg=%s ", option);
+  std::string str = std::string("--cfg=") + option + " ";
 
-  int len = strlen (str);
-  printf ("%s%*.*s %s\n", str, 30-len, 30-len, "", desc);
+  int len = str.size();
+  printf("%s%*.*s %s\n", str.c_str(), 30 - len, 30 - len, "", desc);
   if (longdesc != nullptr && detailed){
     printf ("%s\n\n", longdesc);
   }