Concatenate nested namespaces (sonar).

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

diff --git a/src/xbt/string.cpp b/src/xbt/string.cpp
index 7872cdc..412b22e 100644 (file)
--- a/src/xbt/string.cpp
+++ b/src/xbt/string.cpp
@@ -1,19 +1,16 @@
-/* Copyright (c) 2015-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2015-2022. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <cstdarg>
-#include <cstdio>
-
-#include <simgrid_config.h>
-
+#include <simgrid/config.h>
 #include <xbt/string.hpp>
 #include <xbt/sysdep.h>
 
-namespace simgrid {
-namespace xbt {
+#include <cstdarg>
+#include <cstdio>
+
+namespace simgrid::xbt {
 
 #if SIMGRID_HAVE_MC
 
@@ -28,14 +25,13 @@ std::string string_vprintf(const char *fmt, va_list ap)
   va_copy(ap2, ap);
   int size = std::vsnprintf(nullptr, 0, fmt, ap2);
   va_end(ap2);
-  if (size < 0)
-    xbt_die("string_vprintf error");
+  xbt_assert(size >= 0, "string_vprintf error");
 
   // Allocate the string and format:
   std::string res;
   res.resize(size);
-  if (size != 0 && std::vsnprintf(&res[0], size + 1, fmt, ap) != size)
-    xbt_die("string_vprintf error");
+  if (size != 0)
+    xbt_assert(std::vsnprintf(&res[0], size + 1, fmt, ap) == size, "string_vprintf error");
   return res;
 }
 
@@ -55,5 +51,4 @@ std::string string_printf(const char *fmt, ...)
   return res;
 }
 
-}
-}
+} // namespace simgrid::xbt