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

pldmd/dbus_impl_pdr.hpp

diff --git a/pldmd/dbus_impl_pdr.hpp b/pldmd/dbus_impl_pdr.hpp
index 2a4a889..822a3b2 100644
--- a/pldmd/dbus_impl_pdr.hpp
+++ b/pldmd/dbus_impl_pdr.hpp
@@ -15,7 +15,7 @@
 namespace dbus_api
 {
 
-using PdrIntf = sdbusplus::server::object::object<
+using PdrIntf = sdbusplus::server::object_t<
     sdbusplus::xyz::openbmc_project::PLDM::server::PDR>;
 
 /** @class Pdr
@@ -38,10 +38,8 @@
      *  @param[in] path - Path to attach at.
      *  @param[in] repo - pointer to BMC's primary PDR repo
      */
-    Pdr(sdbusplus::bus::bus& bus, const std::string& path,
-        const pldm_pdr* repo) :
-        PdrIntf(bus, path.c_str()),
-        pdrRepo(repo){};
+    Pdr(sdbusplus::bus_t& bus, const std::string& path, const pldm_pdr* repo) :
+        PdrIntf(bus, path.c_str()), pdrRepo(repo){};
 
     /** @brief Implementation for PdrIntf.FindStateEffecterPDR
      *  @param[in] tid - PLDM terminus ID.

pldmd/dbus_impl_requester.hpp

diff --git a/pldmd/dbus_impl_requester.hpp b/pldmd/dbus_impl_requester.hpp
index e5c08af..a1dfcf5 100644
--- a/pldmd/dbus_impl_requester.hpp
+++ b/pldmd/dbus_impl_requester.hpp
@@ -13,7 +13,7 @@
 namespace dbus_api
 {
 
-using RequesterIntf = sdbusplus::server::object::object<
+using RequesterIntf = sdbusplus::server::object_t<
     sdbusplus::xyz::openbmc_project::PLDM::server::Requester>;
 
 /** @class Requester
@@ -35,7 +35,7 @@
      *  @param[in] bus - Bus to attach to.
      *  @param[in] path - Path to attach at.
      */
-    Requester(sdbusplus::bus::bus& bus, const std::string& path) :
+    Requester(sdbusplus::bus_t& bus, const std::string& path) :
         RequesterIntf(bus, path.c_str()){};
 
     /** @brief Implementation for RequesterIntf.GetInstanceId */

pldmd/pldmd.cpp

diff --git a/pldmd/pldmd.cpp b/pldmd/pldmd.cpp
index 8e39a1f..1e7cd15 100644
--- a/pldmd/pldmd.cpp
+++ b/pldmd/pldmd.cpp
@@ -205,8 +205,8 @@
     }
     auto event = Event::get_default();
     auto& bus = pldm::utils::DBusHandler::getBus();
-    sdbusplus::server::manager::manager objManager(
-        bus, "/xyz/openbmc_project/software");
+    sdbusplus::server::manager_t objManager(bus,
+                                            "/xyz/openbmc_project/software");
     dbus_api::Requester dbusImplReq(bus, "/xyz/openbmc_project/pldm");
 
     Invoker invoker{};