Merge topic 'add-braces'

757b0ff5 Add missing braces around statements in header files
a16bf141 Add missing braces around statements.
bd9e551c PseudoMemcheck: revise style with clang-format.

2 files changed, 24 insertions, 23 deletions

diff --git a/Tests/CMakeLib/PseudoMemcheck/memtester.cxx.in b/Tests/CMakeLib/PseudoMemcheck/memtester.cxx.in
index b141942..e2cdec8 100644
--- a/Tests/CMakeLib/PseudoMemcheck/memtester.cxx.in
+++ b/Tests/CMakeLib/PseudoMemcheck/memtester.cxx.in
@@ -4,8 +4,7 @@
 
 #define RETVAL @_retval@
 
-int
-main(int ac, char **av)
+int main(int ac, char** av)
 {
   cmsys::Encoding::CommandLineArguments args =
     cmsys::Encoding::CommandLineArguments::Main(ac, av);
@@ -16,42 +15,39 @@ main(int ac, char **av)
   std::string logarg;
   bool nextarg = false;
 
-  if (exename.find("valgrind") != exename.npos)
+  if (exename.find("valgrind") != exename.npos) {
     logarg = "--log-file=";
-  else if (exename.find("purify") != exename.npos)
+  } else if (exename.find("purify") != exename.npos) {
 #ifdef _WIN32
     logarg = "/SAVETEXTDATA=";
 #else
     logarg = "-log-file=";
 #endif
-  else if (exename.find("BC") != exename.npos)
-    {
+  } else if (exename.find("BC") != exename.npos) {
     nextarg = true;
     logarg = "/X";
-    }
+  }
 
   if (!logarg.empty()) {
     std::string logfile;
     for (int i = 1; i < argc; i++) {
       std::string arg = argv[i];
-      if (arg.find(logarg) == 0)
-        {
-        if (nextarg)
-          {
-          if (i == argc - 1)
+      if (arg.find(logarg) == 0) {
+        if (nextarg) {
+          if (i == argc - 1) {
             return 1; // invalid command line
-          logfile = argv[i + 1];
           }
-        else
-          {
+          logfile = argv[i + 1];
+        } else {
           logfile = arg.substr(logarg.length());
-          }
-        // keep searching, it may be overridden later to provoke an error
         }
+        // keep searching, it may be overridden later to provoke an error
       }
+    }
 
-    if (!logfile.empty())
+    if (!logfile.empty()) {
       cmSystemTools::Touch(logfile, true);
+    }
   }
 
   return RETVAL;
diff --git a/Tests/CMakeLib/run_compile_commands.cxx b/Tests/CMakeLib/run_compile_commands.cxx
index 1cfd381..b811c7f 100644
--- a/Tests/CMakeLib/run_compile_commands.cxx
+++ b/Tests/CMakeLib/run_compile_commands.cxx
@@ -46,10 +46,12 @@ private:
   void ParseTranslationUnit()
   {
     this->Command = CommandType();
-    if (!Expect('{'))
+    if (!Expect('{')) {
       return;
-    if (Expect('}'))
+    }
+    if (Expect('}')) {
       return;
+    }
     do {
       ParseString();
       std::string name = this->String;
@@ -64,8 +66,9 @@ private:
   void ParseString()
   {
     this->String = "";
-    if (!Expect('"'))
+    if (!Expect('"')) {
       return;
+    }
     while (!Expect('"')) {
       Expect('\\');
       this->String.append(1, C);
@@ -84,8 +87,9 @@ private:
 
   void ExpectOrDie(char c, const std::string& message)
   {
-    if (!Expect(c))
+    if (!Expect(c)) {
       ErrorExit(std::string("'") + c + "' expected " + message + ".");
+    }
   }
 
   void NextNonWhitespace()
@@ -98,8 +102,9 @@ private:
   void Next()
   {
     this->C = char(Input->get());
-    if (this->Input->bad())
+    if (this->Input->bad()) {
       ErrorExit("Unexpected end of file.");
+    }
   }
 
   void ErrorExit(const std::string& message)