CTest: don't use else after return

Source/CTest/cmCTestBuildHandler.cxx

@@ -532,9 +532,8 @@ public:
     if (this->FTC->FileTimeCompare(l.c_str(), r.c_str(), &result) &&
         result != 0) {
       return result < 0;
-    } else {
-      return l < r;
     }
+    return l < r;
   }
 
 private:

Source/CTest/cmCTestCVS.cxx

@@ -216,11 +216,10 @@ std::string cmCTestCVS::ComputeBranchFlag(std::string const& dir)
     std::string flag = "-r";
     flag += tagLine.substr(1);
     return flag;
-  } else {
+  }
   // Use the default branch.
   return "-b";
 }
-}
 
 void cmCTestCVS::LoadRevisions(std::string const& file, const char* branchFlag,
                                std::vector<Revision>& revisions)

Source/CTest/cmCTestCoverageHandler.cxx

@@ -763,12 +763,11 @@ int cmCTestCoverageHandler::HandleMumpsCoverage(
                        this->Quiet);
     cov.ReadCoverageFile(coverageFile.c_str());
     return static_cast<int>(cont->TotalCoverage.size());
-  } else {
+  }
   cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
                      " Cannot find GTM coverage file: " << coverageFile
                                                         << std::endl,
                      this->Quiet);
-  }
   cmParseCacheCoverage ccov(*cont, this->CTest);
   coverageFile = this->CTest->GetBinaryDir() + "/cache_coverage.cmcov";
   if (cmSystemTools::FileExists(coverageFile.c_str())) {

Source/CTest/cmCTestLaunch.cxx

@@ -126,13 +126,12 @@ bool cmCTestLaunch::ParseArguments(int argc, const char* const* argv)
       this->HandleRealArg(this->RealArgV[i]);
     }
     return true;
-  } else {
+  }
   this->RealArgC = 0;
   this->RealArgV = CM_NULLPTR;
   std::cerr << "No launch/command separator ('--') found!\n";
   return false;
 }
-}
 
 void cmCTestLaunch::HandleRealArg(const char* arg)
 {

Source/CTest/cmCTestMemCheckHandler.cxx

@@ -638,28 +638,25 @@ bool cmCTestMemCheckHandler::ProcessMemCheckOutput(const std::string& str,
                                                    std::string& log,
                                                    std::vector<int>& results)
 {
-  if (this->MemoryTesterStyle == cmCTestMemCheckHandler::VALGRIND) {
+  switch (this->MemoryTesterStyle) {
+    case cmCTestMemCheckHandler::VALGRIND:
       return this->ProcessMemCheckValgrindOutput(str, log, results);
-  } else if (this->MemoryTesterStyle == cmCTestMemCheckHandler::PURIFY) {
+    case cmCTestMemCheckHandler::PURIFY:
       return this->ProcessMemCheckPurifyOutput(str, log, results);
-  } else if (this->MemoryTesterStyle ==
+    case cmCTestMemCheckHandler::ADDRESS_SANITIZER:
-               cmCTestMemCheckHandler::ADDRESS_SANITIZER ||
+    case cmCTestMemCheckHandler::THREAD_SANITIZER:
-             this->MemoryTesterStyle ==
+    case cmCTestMemCheckHandler::MEMORY_SANITIZER:
-               cmCTestMemCheckHandler::THREAD_SANITIZER ||
+    case cmCTestMemCheckHandler::UB_SANITIZER:
-             this->MemoryTesterStyle ==
-               cmCTestMemCheckHandler::MEMORY_SANITIZER ||
-             this->MemoryTesterStyle == cmCTestMemCheckHandler::UB_SANITIZER) {
       return this->ProcessMemCheckSanitizerOutput(str, log, results);
-  } else if (this->MemoryTesterStyle ==
+    case cmCTestMemCheckHandler::BOUNDS_CHECKER:
-             cmCTestMemCheckHandler::BOUNDS_CHECKER) {
       return this->ProcessMemCheckBoundsCheckerOutput(str, log, results);
-  } else {
+    default:
       log.append("\nMemory checking style used was: ");
       log.append("None that I know");
       log = str;
-  }
       return true;
   }
+}
 
 std::vector<int>::size_type cmCTestMemCheckHandler::FindOrAddWarning(
   const std::string& warning)

Source/CTest/cmCTestMultiProcessHandler.cxx

@@ -824,9 +824,8 @@ bool cmCTestMultiProcessHandler::CheckCycles()
                 << this->Properties[root]->Name
                 << "\".\nPlease fix the cycle and run ctest again.\n");
             return false;
-          } else {
-            s.push(*d);
           }
+          s.push(*d);
         }
       }
     }

Source/CTest/cmCTestP4.cxx

@@ -373,9 +373,8 @@ std::string cmCTestP4::GetWorkingRevision()
 
   if (rev.empty()) {
     return "0";
-  } else {
-    return rev;
   }
+  return rev;
 }
 
 void cmCTestP4::NoteOldRevision()

Source/CTest/cmCTestRunTest.cxx

@@ -54,7 +54,8 @@ bool cmCTestRunTest::CheckOutput()
     if (p == cmsysProcess_Pipe_None) {
       // Process has terminated and all output read.
       return false;
-    } else if (p == cmsysProcess_Pipe_STDOUT) {
+    }
+    if (p == cmsysProcess_Pipe_STDOUT) {
       // Store this line of output.
       cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, this->GetIndex()
                    << ": " << line << std::endl);
@@ -82,8 +83,7 @@ bool cmCTestRunTest::CheckOutput()
           }
         }
       }
-    } else // if(p == cmsysProcess_Pipe_Timeout)
+    } else { // if(p == cmsysProcess_Pipe_Timeout)
-    {
       break;
     }
   }

Source/CTest/cmCTestSVN.cxx

@@ -80,11 +80,11 @@ static bool cmCTestSVNPathStarts(std::string const& p1, std::string const& p2)
   // Does path p1 start with path p2?
   if (p1.size() == p2.size()) {
     return p1 == p2;
-  } else if (p1.size() > p2.size() && p1[p2.size()] == '/') {
-    return strncmp(p1.c_str(), p2.c_str(), p2.size()) == 0;
-  } else {
-    return false;
   }
+  if (p1.size() > p2.size() && p1[p2.size()] == '/') {
+    return strncmp(p1.c_str(), p2.c_str(), p2.size()) == 0;
+  }
+  return false;
 }
 
 std::string cmCTestSVN::LoadInfo(SVNInfo& svninfo)
@@ -295,9 +295,8 @@ bool cmCTestSVN::RunSVNCommand(std::vector<char const*> const& parameters,
 
   if (strcmp(parameters[0], "update") == 0) {
     return RunUpdateCommand(&args[0], out, err);
-  } else {
-    return RunChild(&args[0], out, err);
   }
+  return RunChild(&args[0], out, err);
 }
 
 class cmCTestSVN::LogParser : public cmCTestVC::OutputLogger,

Source/CTest/cmCTestTestHandler.cxx

@@ -284,7 +284,7 @@ inline int GetNextNumber(std::string const& in, int& val,
     }
     pos = pos2 + 1;
     return 1;
-  } else {
+  }
   if (in.size() - pos == 0) {
     val = -1;
   } else {
@@ -292,7 +292,6 @@ inline int GetNextNumber(std::string const& in, int& val,
   }
   return 0;
 }
-}
 
 // get the next number in a string with numbers separated by ,
 // pos is the start of the search and pos2 is the end of the search
@@ -311,7 +310,7 @@ inline int GetNextRealNumber(std::string const& in, double& val,
     }
     pos = pos2 + 1;
     return 1;
-  } else {
+  }
   if (in.size() - pos == 0) {
     val = -1;
   } else {
@@ -319,7 +318,6 @@ inline int GetNextRealNumber(std::string const& in, double& val,
   }
   return 0;
 }
-}
 
 cmCTestTestHandler::cmCTestTestHandler()
 {

Source/CTest/cmCTestUploadCommand.cxx

@@ -49,7 +49,7 @@ bool cmCTestUploadCommand::CheckArgumentValue(std::string const& arg)
     if (cmSystemTools::FileExists(arg.c_str())) {
       this->Files.insert(arg);
       return true;
-    } else {
+    }
     std::ostringstream e;
     e << "File \"" << arg << "\" does not exist. Cannot submit "
       << "a non-existent file.";
@@ -57,7 +57,6 @@ bool cmCTestUploadCommand::CheckArgumentValue(std::string const& arg)
     this->ArgumentDoing = ArgumentDoingError;
     return false;
   }
-  }
 
   // Look for other arguments.
   return this->Superclass::CheckArgumentValue(arg);

Source/CTest/cmParseBlanketJSCoverage.cxx

@@ -42,9 +42,8 @@ public:
       std::string foundFileName =
         line.substr(begIndex + 3, endIndex - (begIndex + 4));
       return foundFileName;
-    } else {
-      return line.substr(begIndex, line.npos);
     }
+    return line.substr(begIndex, line.npos);
   }
   bool ParseFile(std::string const& file)
   {

Source/CTest/cmParseMumpsCoverage.cxx

@@ -128,7 +128,7 @@ bool cmParseMumpsCoverage::FindMumpsFile(std::string const& routine,
   if (i != this->RoutineToDirectory.end()) {
     filepath = i->second;
     return true;
-  } else {
+  }
   // try some alternate names
   const char* tryname[] = { "GUX", "GTM", "ONT", CM_NULLPTR };
   for (int k = 0; tryname[k] != CM_NULLPTR; k++) {
@@ -139,6 +139,5 @@ bool cmParseMumpsCoverage::FindMumpsFile(std::string const& routine,
       return true;
     }
   }
-  }
   return false;
 }

Source/CTest/cmProcess.cxx

@@ -124,10 +124,10 @@ int cmProcess::GetNextOutputLine(std::string& line, double timeout)
     int p = cmsysProcess_WaitForData(this->Process, &data, &length, &timeout);
     if (p == cmsysProcess_Pipe_Timeout) {
       return cmsysProcess_Pipe_Timeout;
-    } else if (p == cmsysProcess_Pipe_STDOUT) {
+    }
+    if (p == cmsysProcess_Pipe_STDOUT) {
       this->Output.insert(this->Output.end(), data, data + length);
-    } else // p == cmsysProcess_Pipe_None
+    } else { // p == cmsysProcess_Pipe_None
-    {
       // The process will provide no more data.
       break;
     }