code cleanup done and typos removed

Author: hschwane

Log.cpp

@@ -22,7 +22,8 @@ namespace mpu {
 //--------------------
 
 // Variables for logToString
-const std::string LogLvlToString[] = {"NOLOG", "FATAL_ERROR", "ERROR", "WARNING", "INFO", "DEBUG", "DEBUG1", "DEBUG2", "ALL"};
+const std::string LogLvlToString[] = {"NOLOG", "FATAL_ERROR", "ERROR", "WARNING", "INFO", "DEBUG", "DEBUG1", "DEBUG2",
+                                      "ALL"};
 const std::string LogLvlStringInvalid = "INVALID";
 const std::string LogPolicyToString[] = {"NONE", "CONSOLE", "FILE", "SYSLOG", "CUSTOM"};
 
@@ -35,7 +36,7 @@ Log::Log(LogPolicy policy, const std::string &sFile, const std::string &sErrorFi
     sTimeFormat = "%c";
     logLvl = lvl;
     currentLvl = LogLvl::invalid;
-    logPolicy = LogPolicy::none ;
+    logPolicy = LogPolicy::none;
     outStream = nullptr;
     errorStream = nullptr;
 
@@ -52,33 +53,35 @@ Log::Log(LogPolicy policy, std::ostream *out, std::ostream *err, LogLvl lvl)
     sTimeFormat = "%c";
     logLvl = lvl;
     currentLvl = LogLvl::invalid;
-    logPolicy = LogPolicy::none ;
+    logPolicy = LogPolicy::none;
     outStream = nullptr;
     errorStream = nullptr;
 
-    open(policy,out,err);
+    open(policy, out, err);
 
     // first log created is going to be global
-    if(noGlobal())
+    if (noGlobal())
         makeGlobal();
 }
 
 #ifdef __linux__
-    Log::Log(LogPolicy policy, const std::string &sIdent, int iFacility, LogLvl lvl)
-    {
-        sTimeFormat = "%c";
-        logLvl = lvl;
-        currentLvl = LogLvl::invalid;
-        logPolicy = LogPolicy::none ;
-        outStream = nullptr;
-        errorStream = nullptr;
 
-        open(policy, sIdent, iFacility);
+Log::Log(LogPolicy policy, const std::string &sIdent, int iFacility, LogLvl lvl)
+{
+    sTimeFormat = "%c";
+    logLvl = lvl;
+    currentLvl = LogLvl::invalid;
+    logPolicy = LogPolicy::none;
+    outStream = nullptr;
+    errorStream = nullptr;
+
+    open(policy, sIdent, iFacility);
+
+    // first log created is going to be global
+    if (noGlobal())
+        makeGlobal();
+}
 
-        // first log created is going to be global
-        if(noGlobal())
-            makeGlobal();
-    }
 #endif
 
 Log::~Log()
@@ -89,31 +92,31 @@ Log::~Log()
 void Log::open(LogPolicy policy, const std::string &sFile, const std::string &sErrorFile)
 {
     // close in case it is already opened
-    if(logPolicy != LogPolicy::none)
+    if (logPolicy != LogPolicy::none)
         close();
 
-    switch(policy)
+    switch (policy)
     {
-        case console:
-            outStream = &std::cout;
-            errorStream = &std::cerr;
-            break;
-
-        case file:
-            outStream = new std::ofstream(sFile, std::ofstream::out | std::ofstream::app);
-            if(sErrorFile.empty())
-                errorStream = outStream;
-            else
-                errorStream = new std::ofstream(sErrorFile, std::ofstream::out | std::ofstream::app);
-
-            if(!outStream || !dynamic_cast<std::ofstream*>(outStream)->is_open())
-                throw std::runtime_error("Log: Could not open output file stream!");
-            if(!errorStream || !dynamic_cast<std::ofstream*>(errorStream)->is_open())
-                throw std::runtime_error("Log: Could not open output file stream!");
-            break;
-
-        default:
-            throw std::invalid_argument("Log: You called the wrong open function/constructor for your policy!");
+    case console:
+        outStream = &std::cout;
+        errorStream = &std::cerr;
+        break;
+
+    case file:
+        outStream = new std::ofstream(sFile, std::ofstream::out | std::ofstream::app);
+        if (sErrorFile.empty())
+            errorStream = outStream;
+        else
+            errorStream = new std::ofstream(sErrorFile, std::ofstream::out | std::ofstream::app);
+
+        if (!outStream || !dynamic_cast<std::ofstream *>(outStream)->is_open())
+            throw std::runtime_error("Log: Could not open output file stream!");
+        if (!errorStream || !dynamic_cast<std::ofstream *>(errorStream)->is_open())
+            throw std::runtime_error("Log: Could not open output file stream!");
+        break;
+
+    default:
+        throw std::invalid_argument("Log: You called the wrong open function/constructor for your policy!");
     }
 
     logPolicy = policy;
@@ -122,15 +125,15 @@ void Log::open(LogPolicy policy, const std::string &sFile, const std::string &sE
 void Log::open(LogPolicy policy, std::ostream *out, std::ostream *err)
 {
     // close in case it is already opened
-    if(logPolicy != LogPolicy::none)
+    if (logPolicy != LogPolicy::none)
         close();
 
-    if(policy != LogPolicy::custom)
+    if (policy != LogPolicy::custom)
         throw std::invalid_argument("Log: You called the wrong open function/constructor for your policy!");
 
     outStream = out;
 
-    if(err)
+    if (err)
         errorStream = err;
     else
         errorStream = out;
@@ -139,65 +142,67 @@ void Log::open(LogPolicy policy, std::ostream *out, std::ostream *err)
 }
 
 #ifdef __linux__
+
 void Log::open(LogPolicy policy, const std::string &sIdent, int iFacility)
 {
     // close in case it is already opened
-    if(logPolicy != LogPolicy::none)
+    if (logPolicy != LogPolicy::none)
         close();
 
-    if(policy != LogPolicy::syslog)
+    if (policy != LogPolicy::syslog)
         throw std::invalid_argument("Log: You called the wrong open function/constructor for your policy!");
 
     // use the an ostream with the syslog streambuffer
-    outStream = new std::ostream( new SyslogStreambuf(sIdent, iFacility, this));
+    outStream = new std::ostream(new SyslogStreambuf(sIdent, iFacility, this));
     errorStream = outStream;
 
     // turn of timestamp, since syslog already provides a timestamp
     setTimeFormat("");
     logPolicy = policy;
 }
+
 #endif
 
 void Log::close()
 {
     flush();
-    switch(logPolicy)
+    switch (logPolicy)
     {
-        case file:
-            dynamic_cast<std::ofstream*>(outStream)->close();
-            dynamic_cast<std::ofstream*>(errorStream)->close();
-            if(outStream == errorStream)
-            {
-                MPU_SAVE_DELETE(outStream);
-                errorStream = nullptr;
-            }
-            else
-            {
-                MPU_SAVE_DELETE(outStream);
-                MPU_SAVE_DELETE(errorStream);
-            }
-            break;
-        case syslog:
-            // reset the timestamp string
-            setTimeFormat("%c");
-            if(outStream == errorStream)
-            {
-                MPU_SAVE_DELETE(outStream);
-                errorStream = nullptr;
-            }
-            else
-            {
-                MPU_SAVE_DELETE(outStream);
-                MPU_SAVE_DELETE(errorStream);
-            }
-            break;
-        case console:
-        case custom:
-            outStream = nullptr;
+    case file:
+        dynamic_cast<std::ofstream *>(outStream)->close();
+        dynamic_cast<std::ofstream *>(errorStream)->close();
+        if (outStream == errorStream)
+        {
+            MPU_SAVE_DELETE(outStream);
             errorStream = nullptr;
-            break;
-        default:
-            break;
+        }
+        else
+        {
+            MPU_SAVE_DELETE(outStream);
+            MPU_SAVE_DELETE(errorStream);
+        }
+        break;
+    case syslog:
+        // reset the timestamp string
+        setTimeFormat("%c");
+        if (outStream == errorStream)
+        {
+            MPU_SAVE_DELETE(outStream);
+            errorStream = nullptr;
+        }
+        else
+        {
+            MPU_SAVE_DELETE(outStream);
+            MPU_SAVE_DELETE(errorStream);
+        }
+        break;
+    case console:
+    case custom:
+        outStream = nullptr;
+        errorStream = nullptr;
+        break;
+    default:
+        break;
     }
     logPolicy = LogPolicy::none;
 }