X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/84402e8e2ee2a2d0bef25fdceb0a263ed8b471f6..39c935d6d5ee86d153f6f7e6a10d723ae7c57f6f:/src/xbt/log.cpp

diff --git a/src/xbt/log.cpp b/src/xbt/log.cpp
index 0f28f5d473..891c31b9b8 100644
--- a/src/xbt/log.cpp
+++ b/src/xbt/log.cpp
@@ -1,6 +1,6 @@
 /* log - a generic logging facility in the spirit of log4j                  */
 
-/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2021. 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. */
@@ -13,6 +13,7 @@
 #include "xbt/string.hpp"
 
 #include <algorithm>
+#include <array>
 #include <mutex>
 #include <string>
 #include <vector>
@@ -38,16 +39,8 @@ struct xbt_log_setting_t {
 
 static std::vector<xbt_log_setting_t> xbt_log_settings;
 
-const char *xbt_log_priority_names[8] = {
-  "NONE",
-  "TRACE",
-  "DEBUG",
-  "VERBOSE",
-  "INFO",
-  "WARNING",
-  "ERROR",
-  "CRITICAL"
-};
+constexpr std::array<const char*, 8> xbt_log_priority_names{
+    {"NONE", "TRACE", "DEBUG", "VERBOSE", "INFO", "WARNING", "ERROR", "CRITICAL"}};
 
 s_xbt_log_category_t _XBT_LOGV(XBT_LOG_ROOT_CAT) = {
     nullptr /*parent */,
@@ -76,8 +69,8 @@ void xbt_log_preinit(void)
   log_cat_init_mutex                   = new std::recursive_mutex();
 }
 
-static void xbt_log_help(void);
-static void xbt_log_help_categories(void);
+static void xbt_log_help();
+static void xbt_log_help_categories();
 
 /** @brief Get all logging settings from the command line
  *
@@ -158,30 +151,31 @@ void _xbt_log_event_log(xbt_log_event_t ev, const char *fmt, ...)
   const xbt_log_category_s* cat = ev->cat;
 
   xbt_assert(ev->priority >= 0, "Negative logging priority naturally forbidden");
-  xbt_assert(static_cast<size_t>(ev->priority) < sizeof(xbt_log_priority_names)/sizeof(xbt_log_priority_names[0]),
+  xbt_assert(static_cast<size_t>(ev->priority) < xbt_log_priority_names.size(),
              "Priority %d is greater than the biggest allowed value", ev->priority);
 
-  while (1) {
+  while (true) {
     const s_xbt_log_appender_t* appender = cat->appender;
 
     if (appender != nullptr) {
       xbt_assert(cat->layout, "No valid layout for the appender of category %s", cat->name);
 
       /* First, try with a static buffer */
-      int done = 0;
-      char buff[XBT_LOG_STATIC_BUFFER_SIZE];
-      ev->buffer      = buff;
-      ev->buffer_size = sizeof buff;
+      bool done = false;
+      std::array<char, XBT_LOG_STATIC_BUFFER_SIZE> buff;
+      ev->buffer      = buff.data();
+      ev->buffer_size = buff.size();
       va_start(ev->ap, fmt);
       done = cat->layout->do_layout(cat->layout, ev, fmt);
       va_end(ev->ap);
+      ev->buffer = nullptr; // Calm down, static analyzers, this pointer to local array won't leak out of the scope.
       if (done) {
-        appender->do_append(appender, buff);
+        appender->do_append(appender, buff.data());
       } else {
         /* The static buffer was too small, use a dynamically expanded one */
         ev->buffer_size = XBT_LOG_DYNAMIC_BUFFER_SIZE;
         ev->buffer      = static_cast<char*>(xbt_malloc(ev->buffer_size));
-        while (1) {
+        while (true) {
           va_start(ev->ap, fmt);
           done = cat->layout->do_layout(cat->layout, ev, fmt);
           va_end(ev->ap);
@@ -436,18 +430,15 @@ static xbt_log_setting_t _xbt_log_parse_setting(const char *control_string)
 
 static xbt_log_category_t _xbt_log_cat_searchsub(xbt_log_category_t cat, const char* name)
 {
-  xbt_log_category_t child;
-  xbt_log_category_t res;
-
   XBT_DEBUG("Search '%s' into '%s' (firstChild='%s'; nextSibling='%s')", name,
          cat->name, (cat->firstChild ? cat->firstChild->name : "none"),
          (cat->nextSibling ? cat->nextSibling->name : "none"));
   if (strcmp(cat->name, name) == 0)
     return cat;
 
-  for (child = cat->firstChild; child != nullptr; child = child->nextSibling) {
+  for (xbt_log_category_t child = cat->firstChild; child != nullptr; child = child->nextSibling) {
     XBT_DEBUG("Dig into %s", child->name);
-    res = _xbt_log_cat_searchsub(child, name);
+    xbt_log_category_t res = _xbt_log_cat_searchsub(child, name);
     if (res)
       return res;
   }
@@ -547,7 +538,7 @@ void xbt_log_additivity_set(xbt_log_category_t cat, int additivity)
   cat->additivity = additivity;
 }
 
-static void xbt_log_help(void)
+static void xbt_log_help()
 {
   XBT_HELP(
       "Description of the logging output:\n"
@@ -639,7 +630,7 @@ static void xbt_log_help_categories_rec(xbt_log_category_t category, const std::
   }
 }
 
-static void xbt_log_help_categories(void)
+static void xbt_log_help_categories()
 {
   XBT_HELP("Current log category hierarchy:");
   xbt_log_help_categories_rec(&_XBT_LOGV(XBT_LOG_ROOT_CAT), "   ");