commit 84b790cb97faf592fbcc7d5d080409282442e76f
author Patrick Williams <patrick@stwcx.xyz> Fri Jul 22 19:26:56 2022 -0500
committer Patrick Williams <patrick@stwcx.xyz> Mon Aug 01 14:49:40 2022 +0000
tree 49dfa95c636e13213d9897b1b7a74663a5320a89
parent 5e8aee72dce2aae111ef8bacae902f7e4e228607

sdbusplus: use shorter type aliases

The sdbusplus headers provide shortened aliases for many types.
Switch to using them to provide better code clarity and shorter
lines.  Possible replacements are for:
  * bus_t
  * exception_t
  * manager_t
  * match_t
  * message_t
  * object_t
  * slot_t

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I8e2242adb79be342562c9b7f3d2153dfdf578085

softoff/softoff.cpp

diff --git a/softoff/softoff.cpp b/softoff/softoff.cpp
index 8ef0729..1b6f16e 100644
--- a/softoff/softoff.cpp
+++ b/softoff/softoff.cpp
@@ -30,7 +30,7 @@
 constexpr pldm::pdr::TerminusID TID = 0; // TID will be implemented later.
 namespace sdbusRule = sdbusplus::bus::match::rules;
 
-SoftPowerOff::SoftPowerOff(sdbusplus::bus::bus& bus, sd_event* event) :
+SoftPowerOff::SoftPowerOff(sdbusplus::bus_t& bus, sd_event* event) :
     bus(bus), timer(event)
 {
     getHostState();
@@ -100,7 +100,7 @@
     return PLDM_SUCCESS;
 }
 
-void SoftPowerOff::hostSoftOffComplete(sdbusplus::message::message& msg)
+void SoftPowerOff::hostSoftOffComplete(sdbusplus::message_t& msg)
 {
     pldm::pdr::TerminusID msgTID;
     pldm::pdr::SensorID msgSensorID;
@@ -161,7 +161,7 @@
             VMMPdrExist = false;
         }
     }
-    catch (const sdbusplus::exception::exception& e)
+    catch (const sdbusplus::exception_t& e)
     {
         std::cerr << "PLDM soft off: Error get VMM PDR,ERROR=" << e.what()
                   << "\n";
@@ -205,7 +205,7 @@
             effecterID = sysFwPdr->effecter_id;
         }
     }
-    catch (const sdbusplus::exception::exception& e)
+    catch (const sdbusplus::exception_t& e)
     {
         std::cerr << "PLDM soft off: Error get system firmware PDR,ERROR="
                   << e.what() << "\n";
@@ -282,7 +282,7 @@
                 possibleStateSize + sizeof(setId) + sizeof(possibleStateSize);
         }
     }
-    catch (const sdbusplus::exception::exception& e)
+    catch (const sdbusplus::exception_t& e)
     {
         std::cerr << "PLDM soft off: Error get State Sensor PDR,ERROR="
                   << e.what() << "\n";
@@ -313,7 +313,7 @@
 
         ResponseMsg.read(instanceID);
     }
-    catch (const sdbusplus::exception::exception& e)
+    catch (const sdbusplus::exception_t& e)
     {
         std::cerr << "PLDM soft off: Error get instanceID,ERROR=" << e.what()
                   << "\n";

softoff/softoff.hpp

diff --git a/softoff/softoff.hpp b/softoff/softoff.hpp
index 302144c..e9a8f44 100644
--- a/softoff/softoff.hpp
+++ b/softoff/softoff.hpp
@@ -24,7 +24,7 @@
      *  @param[in] bus       - system D-Bus handler
      *  @param[in] event     - sd_event handler
      */
-    SoftPowerOff(sdbusplus::bus::bus& bus, sd_event* event);
+    SoftPowerOff(sdbusplus::bus_t& bus, sd_event* event);
 
     /** @brief Is the pldm-softpoweroff has error.
      * if hasError is true, that means the pldm-softpoweroff failed to
@@ -82,7 +82,7 @@
      *
      *  @param[in] msg - Data associated with subscribed signal
      */
-    void hostSoftOffComplete(sdbusplus::message::message& msg);
+    void hostSoftOffComplete(sdbusplus::message_t& msg);
 
     /** @brief Start the timer.
      *
@@ -133,7 +133,7 @@
     bool VMMPdrExist = true;
 
     /* @brief sdbusplus handle */
-    sdbusplus::bus::bus& bus;
+    sdbusplus::bus_t& bus;
 
     /** @brief Reference to Timer object */
     phosphor::Timer timer;