No need to duplicate string.

[simgrid.git] / src / xbt / xbt_main.cpp

diff --git a/src/xbt/xbt_main.cpp b/src/xbt/xbt_main.cpp
index ce2bc71..92a311b 100644 (file)
--- a/src/xbt/xbt_main.cpp
+++ b/src/xbt/xbt_main.cpp
@@ -7,14 +7,14 @@
 
 #define XBT_LOG_LOCALLY_DEFINE_XBT_CHANNEL /* MSVC don't want it to be declared extern in headers and local here */
 
-#include <math.h>
-#include "xbt/misc.h"
 #include "simgrid_config.h"
-#include "xbt/sysdep.h"
+#include "xbt/config.h"
+#include "xbt/dynar.h"
 #include "xbt/log.h"
 #include "xbt/log.hpp"
-#include "xbt/dynar.h"
-#include "xbt/config.h"
+#include "xbt/misc.h"
+#include "xbt/sysdep.h"
+#include <cmath>
 
 #include "xbt/module.h"         /* this module */
 
@@ -23,12 +23,12 @@
 #include "simgrid/sg_config.h"
 
 #include "src/internal_config.h"
-#include <stdio.h>
+#include <cstdio>
 #ifdef _WIN32
-#include <signal.h> /* To silence MSVC on abort() */
+# include <csignal> /* To silence MSVC on abort() */
 #endif
 #if HAVE_UNISTD_H
-#  include <unistd.h>
+# include <unistd.h>
 #endif
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(module, xbt, "module handling");
@@ -47,8 +47,8 @@ int xbt_pagebits = 0;
 /* Declare xbt_preinit and xbt_postexit as constructor/destructor of the library.
  * This is crude and rather compiler-specific, unfortunately.
  */
-static void xbt_preinit(void) _XBT_GNUC_CONSTRUCTOR(200);
-static void xbt_postexit(void);
+static void xbt_preinit() _XBT_GNUC_CONSTRUCTOR(200);
+static void xbt_postexit();
 
 #ifdef _WIN32
 #include <windows.h>
@@ -75,7 +75,8 @@ static BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserv
 
 #endif
 
-static void xbt_preinit(void) {
+static void xbt_preinit()
+{
   unsigned int seed = 2147483647;
 #ifdef _WIN32
   SYSTEM_INFO si;
@@ -84,7 +85,7 @@ static void xbt_preinit(void) {
 #elif HAVE_SYSCONF
   xbt_pagesize = sysconf(_SC_PAGESIZE);
 #else
-  #error Cannot get page size.
+# error Cannot get page size.
 #endif
 
   xbt_pagebits = log2(xbt_pagesize);
@@ -104,16 +105,15 @@ static void xbt_preinit(void) {
   atexit(xbt_postexit);
 }
 
-static void xbt_postexit(void)
+static void xbt_postexit()
 {
-  if (!_sg_do_clean_atexit)
+  if (not _sg_do_clean_atexit)
     return;
   xbt_initialized--;
   xbt_dict_postexit();
   xbt_os_thread_mod_postexit();
   xbt_dynar_free(&xbt_cmdline);
   xbt_log_postexit();
-  free(xbt_binary_name);
 #if SIMGRID_HAVE_MC
   mmalloc_postexit();
 #endif
@@ -130,11 +130,11 @@ void xbt_init(int *argc, char **argv)
     return;
   }
 
-  xbt_binary_name = xbt_strdup(argv[0]);
+  xbt_binary_name = argv[0];
   xbt_cmdline     = xbt_dynar_new(sizeof(char*), NULL);
   for (int i = 0; i < *argc; i++)
     xbt_dynar_push(xbt_cmdline,&(argv[i]));
-  
+
   xbt_log_init(argc, argv);
 }
 
@@ -152,11 +152,11 @@ void xbt_free_ref(void *d)
 }
 
 /** @brief Kill the program in silence */
-void xbt_abort(void)
+void xbt_abort()
 {
 #ifdef COVERAGE
   /* Call __gcov_flush on abort when compiling with coverage options. */
-  extern void __gcov_flush(void);
+  extern void __gcov_flush();
   __gcov_flush();
 #endif
 #ifdef _WIN32