cmSystemTools: Fix 'ErrorOccurred' spelling

Rename the booleans 's_ErrorOccured' and 's_FatalErrorOccured' to
's_ErrorOccurred' and 's_FatalErrorOccurred', respectively.

Rename the getters and setters to 'Get[Fatal]ErrorOccurred' and
'Set[Fatal]ErrorOccurred', and fix all uses across the codebase.

6 files changed, 10 insertions, 10 deletions

diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 594f408eb6..5dae966437 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -151,7 +151,7 @@ bool cmCPackWIXGenerator::RunLightCommand(std::string const& objectFiles)
 
 int cmCPackWIXGenerator::PackageFiles()
 {
-  if (!PackageFilesImpl() || cmSystemTools::GetErrorOccuredFlag()) {
+  if (!PackageFilesImpl() || cmSystemTools::GetErrorOccurredFlag()) {
     cmCPackLogger(cmCPackLog::LOG_ERROR,
                   "Fatal WiX Generator Error" << std::endl);
     return false;
diff --git a/Source/CPack/cmCPackExternalGenerator.cxx b/Source/CPack/cmCPackExternalGenerator.cxx
index 157ee1de22..edd8490459 100644
--- a/Source/CPack/cmCPackExternalGenerator.cxx
+++ b/Source/CPack/cmCPackExternalGenerator.cxx
@@ -73,7 +73,7 @@ int cmCPackExternalGenerator::PackageFiles()
 
     bool res = this->MakefileMap->ReadListFile(packageScript);
 
-    if (cmSystemTools::GetErrorOccuredFlag() || !res) {
+    if (cmSystemTools::GetErrorOccurredFlag() || !res) {
       return 0;
     }
 
diff --git a/Source/CPack/cmCPackFreeBSDGenerator.cxx b/Source/CPack/cmCPackFreeBSDGenerator.cxx
index b5d41fcb7b..607d79772b 100644
--- a/Source/CPack/cmCPackFreeBSDGenerator.cxx
+++ b/Source/CPack/cmCPackFreeBSDGenerator.cxx
@@ -290,7 +290,7 @@ void cmCPackFreeBSDGenerator::write_manifest_fields(
     cmExpandedList(var_lookup("CPACK_FREEBSD_PACKAGE_LICENSE"));
   std::string licenselogic("single");
   if (licenses.empty()) {
-    cmSystemTools::SetFatalErrorOccured();
+    cmSystemTools::SetFatalErrorOccurred();
   } else if (licenses.size() > 1) {
     licenselogic = var_lookup("CPACK_FREEBSD_PACKAGE_LICENSE_LOGIC");
   }
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 7ddb1039df..90d15f82c1 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -525,7 +525,7 @@ int cmCPackGenerator::InstallProjectViaInstallScript(
       this->SetOptionIfNotSet("CMAKE_CURRENT_SOURCE_DIR",
                               tempInstallDirectory);
       bool res = this->MakefileMap->ReadListFile(installScript);
-      if (cmSystemTools::GetErrorOccuredFlag() || !res) {
+      if (cmSystemTools::GetErrorOccurredFlag() || !res) {
         return 0;
       }
     }
@@ -973,7 +973,7 @@ int cmCPackGenerator::InstallCMakeProject(
       }
     }
   }
-  if (cmSystemTools::GetErrorOccuredFlag() || !res) {
+  if (cmSystemTools::GetErrorOccurredFlag() || !res) {
     return 0;
   }
   return 1;
@@ -985,7 +985,7 @@ bool cmCPackGenerator::ReadListFile(const char* moduleName)
   std::string fullPath = this->MakefileMap->GetModulesFile(moduleName);
   retval = this->MakefileMap->ReadListFile(fullPath);
   // include FATAL_ERROR and ERROR in the return status
-  retval = retval && (!cmSystemTools::GetErrorOccuredFlag());
+  retval = retval && (!cmSystemTools::GetErrorOccurredFlag());
   return retval;
 }
 
@@ -1117,7 +1117,7 @@ int cmCPackGenerator::DoPackage()
     this->MakefileMap->SetPolicyVersion(cmVersion::GetCMakeVersion(),
                                         std::string());
 
-    if (!this->PackageFiles() || cmSystemTools::GetErrorOccuredFlag()) {
+    if (!this->PackageFiles() || cmSystemTools::GetErrorOccurredFlag()) {
       cmCPackLogger(cmCPackLog::LOG_ERROR,
                     "Problem compressing the directory" << std::endl);
       return 0;
@@ -1214,7 +1214,7 @@ int cmCPackGenerator::Initialize(const std::string& name, cmMakefile* mf)
     mf->ReadListFile(config);
   }
   int result = this->InitializeInternal();
-  if (cmSystemTools::GetErrorOccuredFlag()) {
+  if (cmSystemTools::GetErrorOccurredFlag()) {
     return 0;
   }
 
diff --git a/Source/CPack/cmCPackLog.cxx b/Source/CPack/cmCPackLog.cxx
index 49e411393d..d37531b916 100644
--- a/Source/CPack/cmCPackLog.cxx
+++ b/Source/CPack/cmCPackLog.cxx
@@ -159,6 +159,6 @@ void cmCPackLog::Log(int tag, const char* file, int line, const char* msg,
   }
 
   if (error) {
-    cmSystemTools::SetErrorOccured();
+    cmSystemTools::SetErrorOccurred();
   }
 }
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index 6c6d0ca7bb..221f7ddbb2 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -473,7 +473,7 @@ int main(int argc, char const* const* argv)
     return doc.PrintRequestedDocumentation(std::cout) ? 0 : 1;
   }
 
-  if (cmSystemTools::GetErrorOccuredFlag()) {
+  if (cmSystemTools::GetErrorOccurredFlag()) {
     return 1;
   }