commit 615e3ff8c8505967ed6d1c38ab371938b4860d15
author Michael Shen <gpgpgp@google.com> Wed Sep 13 06:18:13 2023 +0000
committer Michael Shen <gpgpgp@google.com> Sat Sep 23 08:36:30 2023 +0000
tree 0510278c9c38eae18c2c31cad9766b3f560f948b
parent 27fd17a4d484c402cfcecb44ddda7ca7aa83aab4

dbus_handler: Change variable name for alignment

Align the variable name.
bm -> bootManager

Tested: Buildable
Google-Bug-Id: 296530445
Change-Id: Id5c2c37ab31268e93d7d5d914493673fc1c026ed
Signed-off-by: Michael Shen <gpgpgp@google.com>

include/dbus_handler.hpp

diff --git a/include/dbus_handler.hpp b/include/dbus_handler.hpp
index 847125e..1d68b5a 100644
--- a/include/dbus_handler.hpp
+++ b/include/dbus_handler.hpp
@@ -26,7 +26,7 @@
 {
   public:
     DbusHandler(sdbusplus::bus::bus& dbus, const std::string& objPath,
-                std::shared_ptr<BootManagerIface> bm,
+                std::shared_ptr<BootManagerIface> bootManager,
                 std::shared_ptr<UtilIface> util);
 
     void setCheckpoint(std::string checkpointName, int64_t wallTime,
@@ -40,7 +40,7 @@
     bool isRebooting() const override;
 
   private:
-    std::shared_ptr<BootManagerIface> bm;
+    std::shared_ptr<BootManagerIface> bootManager;
     std::shared_ptr<UtilIface> util;
 };
 

src/dbus_handler.cpp

diff --git a/src/dbus_handler.cpp b/src/dbus_handler.cpp
index 5927cb1..79048a4 100644
--- a/src/dbus_handler.cpp
+++ b/src/dbus_handler.cpp
@@ -19,12 +19,12 @@
 {
 
 DbusHandler::DbusHandler(sdbusplus::bus::bus& dbus, const std::string& objPath,
-                         std::shared_ptr<BootManagerIface> bm,
+                         std::shared_ptr<BootManagerIface> bootManager,
                          std::shared_ptr<UtilIface> util) :
     sdbusplus::server::object::object<Duration>(dbus, objPath.c_str()),
     sdbusplus::server::object::object<Checkpoint>(dbus, objPath.c_str()),
-    sdbusplus::server::object::object<Statistic>(dbus, objPath.c_str()), bm(bm),
-    util(util)
+    sdbusplus::server::object::object<Statistic>(dbus, objPath.c_str()),
+    bootManager(bootManager), util(util)
 {}
 
 void DbusHandler::setCheckpoint(std::string checkpointName, int64_t wallTime,
@@ -35,7 +35,7 @@
         throw sdbusplus::xyz::openbmc_project::Common::Error::InvalidArgument();
     }
 
-    bm->setCheckpoint(checkpointName, wallTime, selfMeasuredDuration);
+    bootManager->setCheckpoint(checkpointName, wallTime, selfMeasuredDuration);
 }
 
 std::vector<std::tuple<std::string, int64_t, int64_t>>
@@ -44,7 +44,8 @@
     std::vector<std::tuple<std::string, int64_t, int64_t>> result;
 
     for (const auto& cp :
-         (bm->isRebooting() ? bm->getCheckpoints() : bm->getPreCheckpoints()))
+         (bootManager->isRebooting() ? bootManager->getCheckpoints()
+                                     : bootManager->getPreCheckpoints()))
     {
         result.emplace_back(std::make_tuple(cp.name, cp.wallTime, cp.monoTime));
     }
@@ -61,7 +62,7 @@
         return;
     }
 
-    bm->notifyComplete();
+    bootManager->notifyComplete();
 }
 
 void DbusHandler::setDuration(std::string durationName, int64_t duration)
@@ -71,7 +72,7 @@
         throw sdbusplus::xyz::openbmc_project::Common::Error::InvalidArgument();
     }
 
-    bm->setDuration(durationName, duration);
+    bootManager->setDuration(durationName, duration);
 }
 
 std::vector<std::tuple<std::string, int64_t>>
@@ -80,7 +81,8 @@
     std::vector<std::tuple<std::string, int64_t>> result;
 
     for (const auto& dur :
-         (bm->isRebooting() ? bm->getDurations() : bm->getPreDurations()))
+         (bootManager->isRebooting() ? bootManager->getDurations()
+                                     : bootManager->getPreDurations()))
     {
         result.emplace_back(std::make_tuple(dur.name, dur.duration));
     }
@@ -89,7 +91,7 @@
 
 bool DbusHandler::isRebooting() const
 {
-    return bm->isRebooting();
+    return bootManager->isRebooting();
 }
 
 } // namespace boot_time_monitor