Fix Errors found during CI

Author: deepakala-k

redfish-core/include/utils/error_log_utils.hpp

@@ -26,11 +26,11 @@ namespace error_log_utils
  *       might delete by the user via Redfish but, we should not throw
  *       internal error in that case, just log trace and return.
  */
-inline void setErrorLogUri(
-    const std::shared_ptr<bmcweb::AsyncResp>& aResp,
-    const sdbusplus::message::object_path& errorLogObjPath,
-    const nlohmann::json_pointer<nlohmann::json>& errorLogPropPath,
-    const bool isLink)
+inline void
+    setErrorLogUri(const std::shared_ptr<bmcweb::AsyncResp>& aResp,
+                   const sdbusplus::message::object_path& errorLogObjPath,
+                   const nlohmann::json::json_pointer& errorLogPropPath,
+                   const bool isLink)
 {
     // Get the Hidden Property
     crow::connections::systemBus->async_method_call(

redfish-core/include/utils/hw_isolation.hpp

@@ -132,7 +132,7 @@ inline void
                                     "InvalidArgument") == 0)
         {
             messages::propertyValueExternalConflict(
-                aResp->res, "Enabled", std::to_string(enabledPropVal));
+                aResp->res, "Enabled", std::to_string(enabledPropVal ? 1 : 0));
         }
         else if (strcmp(dbusError->name, "xyz.openbmc_project.Common.Error."
                                          "NotAllowed") == 0)
@@ -143,8 +143,9 @@ inline void
                                          "HardwareIsolation.Error."
                                          "IsolatedAlready") == 0)
         {
-            messages::resourceAlreadyExists(aResp->res, resourceName, "Enabled",
-                                            std::to_string(enabledPropVal));
+            messages::resourceAlreadyExists(
+                aResp->res, resourceName, "Enabled",
+                std::to_string(enabledPropVal ? 1 : 0));
         }
         else if (strcmp(dbusError->name, "xyz.openbmc_project.Common.Error."
                                          "TooManyResources") == 0)
@@ -419,11 +420,10 @@ inline void processHardwareIsolationReq(
  * @return True on success
  *         False on failure and set the error in the redfish response.
  */
-inline bool
-    setSeverity(const std::shared_ptr<bmcweb::AsyncResp>& aResp,
-                const sdbusplus::message::object_path& objPath,
-                const nlohmann::json_pointer<nlohmann::json>& severityPropPath,
-                const std::string& severityVal)
+inline bool setSeverity(const std::shared_ptr<bmcweb::AsyncResp>& aResp,
+                        const sdbusplus::message::object_path& objPath,
+                        const nlohmann::json::json_pointer& severityPropPath,
+                        const std::string& severityVal)
 {
     if (severityVal == "xyz.openbmc_project.Logging.Event."
                        "SeverityLevel.Critical")
@@ -607,7 +607,7 @@ inline void
                                 sdbusplus::message::object_path errPath =
                                     std::get<2>(assoc);
                                 // we have only one condition
-                                nlohmann::json_pointer logEntryPropPath =
+                                nlohmann::json::json_pointer logEntryPropPath =
                                     "/Status/Conditions/0/LogEntry"_json_pointer;
                                 error_log_utils::setErrorLogUri(
                                     aResp, errPath, logEntryPropPath, true);
@@ -702,7 +702,7 @@ inline void
                         }
 
                         // we have only one condition
-                        nlohmann::json_pointer severityPropPath =
+                        nlohmann::json::json_pointer severityPropPath =
                             "/Status/Conditions/0/Severity"_json_pointer;
                         if (!setSeverity(aResp, hwStatusEventObj,
                                          severityPropPath, *severity))

redfish-core/include/utils/name_utils.hpp

@@ -55,7 +55,7 @@ inline void getPrettyName(
 
         const std::string* value = std::get_if<std::string>(&prettyName);
 
-        if (!value)
+        if (value == nullptr)
         {
 
             BMCWEB_LOG_ERROR << "Failed to get Pretty Name for " << path;

redfish-core/lib/assembly.hpp

@@ -921,7 +921,7 @@ inline void fillWithAssemblyId(
     const std::string& assemblyParentServ,
     const sdbusplus::message::object_path& assemblyParentObjPath,
     const std::string& assemblyParentIface,
-    const nlohmann::json_pointer<nlohmann::json>& assemblyUriPropPath,
+    const nlohmann::json::json_pointer& assemblyUriPropPath,
     const sdbusplus::message::object_path& assembledObjPath,
     const std::string& assembledUriVal)
 {

redfish-core/lib/processor.hpp

@@ -900,7 +900,7 @@ inline void getProcessorPaths(const std::shared_ptr<bmcweb::AsyncResp>& aResp,
                               const std::string& processorId, Handler&& handler)
 {
     crow::connections::systemBus->async_method_call(
-        [processorId, aResp, handler{std::move(handler)}](
+        [processorId, aResp, handler{std::forward<Handler>(handler)}](
             const boost::system::error_code ec,
             const std::vector<std::string>& subTreePaths) {
         if (ec)
@@ -1035,7 +1035,7 @@ inline void
                 }
             }
 
-            if (present == false)
+            if (!present)
             {
                 aResp->res.jsonValue["Status"]["State"] = "Absent";
             }
@@ -1113,7 +1113,7 @@ inline void getSubProcessorData(const std::shared_ptr<bmcweb::AsyncResp>& aResp,
                 return;
             }
 
-            if (subtree.size() != 0)
+            if (!subtree.empty())
             {
                 // Object not found
                 messages::resourceNotFound(