Merge pull request #4298 from micheleCTDE/fix/warnings

Fix compiling warnings
uncrustify · May 18, 2024 · 0bf7766 · 0bf7766
2 parents a4cb495 + 90ea873
commit 0bf7766
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/src/newlines/class_colon_pos.cpp b/src/newlines/class_colon_pos.cpp
@@ -9,8 +9,8 @@
 
 #include "align/stack.h"
 #include "chunk.h"
-#include "log_rules.h"
 #include "keywords.h"
+#include "log_rules.h"
 #include "mark_change.h"
 #include "newlines/add.h"
 #include "newlines/force.h"

diff --git a/src/newlines/oc_msg.cpp b/src/newlines/oc_msg.cpp
@@ -88,18 +88,20 @@ void newline_oc_msg(Chunk *start)
    {
       should_nl_msg = true;
    }
-
    bool finish_multi_line = options::nl_oc_msg_args_finish_multi_line();
-   if (finish_multi_line) {
-      size_t prev_line = -1;
+
+   if (finish_multi_line)
+   {
+      size_t prev_line = 0;
+
       for (Chunk *pc = start->GetNextNcNnl(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
       {
          if (pc->GetLevel() <= start->GetLevel())
          {
             break;
          }
 
-         if (prev_line != -1 && pc->GetOrigLine() != prev_line)
+         if (prev_line > 0 && pc->GetOrigLine() != prev_line)
          {
             should_nl_msg = true;
          }

diff --git a/src/output.cpp b/src/output.cpp
@@ -2266,18 +2266,12 @@ static std::map<std::size_t, std::pair<std::wregex, std::wregex> > get_reflow_fo
 
          while (it_regex != it_regex_end)
          {
-            std::wsmatch match = *it_regex;
+            std::wsmatch match     = *it_regex;
+            auto         &&index   = std::stoi(match[3].str());
+            std::wregex  *p_wregex = (match[1].length() > 0) ? &regex_map[index].second
+                                                     : &regex_map[index].first;
+            *p_wregex = match[4].str();
 
-            if (  ((  match[1].matched
-                   || match[2].matched))
-               && match[3].matched
-               && match[4].matched)
-            {
-               auto        &&index   = std::stoi(match[3].str());
-               std::wregex *p_wregex = match[1].matched ? &regex_map[index].second
-                                                        : &regex_map[index].first;
-               *p_wregex = match[4].str();
-            }
             ++it_regex;
          }
       }

diff --git a/src/tokenizer/EnumStructUnionParser.cpp b/src/tokenizer/EnumStructUnionParser.cpp
@@ -1624,6 +1624,7 @@ void EnumStructUnionParser::mark_constructors()
          {
             break;                            // Issue #4250
          }
+
          if (  std::strcmp(prev->Text(), name) == 0
             && prev->GetLevel() == level
             && next->IsParenOpen())