Add -Wextra to CFLAGS too.

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

diff --git a/src/xbt/log.cpp b/src/xbt/log.cpp
index 2852cf8..d4e4fdd 100644 (file)
--- a/src/xbt/log.cpp
+++ b/src/xbt/log.cpp
@@ -280,9 +280,9 @@ int _xbt_log_cat_init(xbt_log_category_t category, e_xbt_log_priority_t priority
   }
 
   /* Apply the control */
-  auto iset = std::find_if(begin(xbt_log_settings()), end(xbt_log_settings()),
-                           [category](const xbt_log_setting_t& s) { return s.catname == category->name; });
-  if (iset != xbt_log_settings().end()) {
+  if (auto iset = std::find_if(begin(xbt_log_settings()), end(xbt_log_settings()),
+                               [category](const xbt_log_setting_t& s) { return s.catname == category->name; });
+      iset != xbt_log_settings().end()) {
     _xbt_log_cat_apply_set(category, *iset);
     xbt_log_settings().erase(iset);
   } else {
@@ -411,7 +411,7 @@ static xbt_log_setting_t _xbt_log_parse_setting(const char *control_string)
       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);
+    set.fmt = value;
   } else {
     xbt_die("Unknown setting of the log category: '%.*s'", static_cast<int>(option_len), option);
   }