commit 0cd6d84b0a58a950e691835f3241395d4628a6d4
author Lei YU <yulei.sh@bytedance.com> Mon Dec 27 11:56:02 2021 +0800
committer Lei YU <yulei.sh@bytedance.com> Fri Jan 07 05:21:11 2022 +0000
tree 7e86e8265b7eb7f31036af1d53f2e641739c965f
parent 3d8ab813d89d4a40da06e529b7659c9b7bf0a485

cleanup: Fix warnings found by cppcheck

Fix various warnings found by cppcheck.

Signed-off-by: Lei YU <yulei.sh@bytedance.com>
Change-Id: I4db2319f5890d7aa73c8f418f610a6cba338ce24

usb/usb_manager.cpp

diff --git a/usb/usb_manager.cpp b/usb/usb_manager.cpp
index 5e225ac..4a1f768 100644
--- a/usb/usb_manager.cpp
+++ b/usb/usb_manager.cpp
@@ -57,11 +57,11 @@
 {
     utils::PropertyValue value =
         "xyz.openbmc_project.Software.ApplyTime.RequestedApplyTimes.OnReset";
-    constexpr auto objectPath = "/xyz/openbmc_project/software/apply_time";
-    constexpr auto interface = "xyz.openbmc_project.Software.ApplyTime";
-    constexpr auto propertyName = "RequestedApplyTime";
     try
     {
+        constexpr auto objectPath = "/xyz/openbmc_project/software/apply_time";
+        constexpr auto interface = "xyz.openbmc_project.Software.ApplyTime";
+        constexpr auto propertyName = "RequestedApplyTime";
         utils::setProperty(bus, objectPath, interface, propertyName, value);
     }
     catch (const std::exception& e)
@@ -75,10 +75,10 @@
 {
     utils::PropertyValue value =
         "xyz.openbmc_project.Software.Activation.RequestedActivations.Active";
-    constexpr auto interface = "xyz.openbmc_project.Software.Activation";
-    constexpr auto propertyName = "RequestedActivation";
     try
     {
+        constexpr auto interface = "xyz.openbmc_project.Software.Activation";
+        constexpr auto propertyName = "RequestedActivation";
         utils::setProperty(bus, path, interface, propertyName, value);
     }
     catch (const std::exception& e)