[sonar] Constify pointer and reference local variables in src/xbt/.

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

diff --git a/src/xbt/log.cpp b/src/xbt/log.cpp
index 5472200..0060b27 100644 (file)
--- a/src/xbt/log.cpp
+++ b/src/xbt/log.cpp
@@ -5,11 +5,12 @@
 /* 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 "src/xbt_modinter.h"
 #include "src/xbt/log_private.hpp"
+#include "src/xbt_modinter.h"
 #include "xbt/asserts.h"
 #include "xbt/dynar.h"
 #include "xbt/str.h"
+#include "xbt/string.hpp"
 
 #include <algorithm>
 #include <mutex>
@@ -156,7 +157,7 @@ static constexpr size_t XBT_LOG_DYNAMIC_BUFFER_SIZE = 4096;
 
 void _xbt_log_event_log(xbt_log_event_t ev, const char *fmt, ...)
 {
-  xbt_log_category_t cat = ev->cat;
+  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]),
@@ -179,7 +180,6 @@ void _xbt_log_event_log(xbt_log_event_t ev, const char *fmt, ...)
       if (done) {
         appender->do_append(appender, buff);
       } 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));
@@ -282,7 +282,7 @@ int _xbt_log_cat_init(xbt_log_category_t category, e_xbt_log_priority_t priority
 
     if (XBT_LOG_ISENABLED(log, xbt_log_priority_debug)) {
       std::string res;
-      xbt_log_category_t cpp = category->parent->firstChild;
+      const xbt_log_category_s* cpp = category->parent->firstChild;
       while (cpp) {
         res += std::string(" ") + cpp->name;
         cpp = cpp->nextSibling;
@@ -405,15 +405,11 @@ static xbt_log_setting_t _xbt_log_parse_setting(const char *control_string)
     }else if (i < xbt_log_priority_infinite) {
       set.thresh = (e_xbt_log_priority_t)i;
     } else {
-      THROWF(arg_error, 0,
-             "Unknown priority name: %s (must be one of: trace,debug,verbose,info,warning,error,critical)", value);
+      throw std::invalid_argument(simgrid::xbt::string_printf(
+          "Unknown priority name: %s (must be one of: trace,debug,verbose,info,warning,error,critical)", value));
     }
   } else if (strncmp(option, "additivity", option_len) == 0) {
-    if (strcasecmp(value, "ON") == 0 || strcasecmp(value, "YES") == 0 || strcmp(value, "1") == 0) {
-      set.additivity = 1;
-    } else {
-      set.additivity = 0;
-    }
+    set.additivity = (strcasecmp(value, "ON") == 0 || strcasecmp(value, "YES") == 0 || strcmp(value, "1") == 0);
   } else if (strncmp(option, "appender", option_len) == 0) {
     if (strncmp(value, "file:", 5) == 0) {
       set.appender = xbt_log_appender_file_new(value + 5);
@@ -426,7 +422,7 @@ static xbt_log_setting_t _xbt_log_parse_setting(const char *control_string)
     } else if (strcmp(value, "stdout") == 0) {
       set.appender = xbt_log_appender_stream(stdout);
     } else {
-      THROWF(arg_error, 0, "Unknown appender log type: '%s'", value);
+      throw std::invalid_argument(simgrid::xbt::string_printf("Unknown appender log type: '%s'", value));
     }
   } else if (strncmp(option, "fmt", option_len) == 0) {
     set.fmt = std::string(value);
@@ -602,6 +598,17 @@ static void xbt_log_help(void)
       "         -> %%d: date (UNIX-like epoch)\n"
       "         -> %%r: application age (time elapsed since the beginning of the application)\n"
       "\n"
+      "   Category appender: --log=CATEGORY_NAME.app:APPENDER\n"
+      "      APPENDER may be:\n"
+      "         -> stdout or stderr: standard output streams\n"
+      "         -> file:NAME: append to file with given name\n"
+      "         -> splitfile:SIZE:NAME: append to files with maximum size SIZE per file.\n"
+      "                                 NAME may contain the %% wildcard as a placeholder for the file number.\n"
+      "         -> rollfile:SIZE:NAME: append to file with maximum size SIZE.\n"
+      "\n"
+      "   Category additivity: --log=CATEGORY_NAME.add:VALUE\n"
+      "      VALUE:  '0', '1', 'no', 'yes', 'on', or 'off'\n"
+      "\n"
       "   Miscellaneous:\n"
       "      --help-log-categories    Display the current hierarchy of log categories.\n"
       "      --log=no_loc             Don't print file names in messages (for tesh tests).\n");