commit b3dbfb37a6624153d5c27d87fc07d95e36bef352
author Patrick Williams <patrick@stwcx.xyz> Fri Jul 22 19:26:57 2022 -0500
committer Jayanth Othayoth <ojayanth@gmail.com> Tue Jul 26 04:52:03 2022 +0000
tree 9e6db8b5d6f2546dcd2fbdbe3c1c802d334d4b2f
parent 127244ae4bb5f6eacef851aa7ff9a1adfcbd08b1

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: I9bb7b9a430d029ddaf2a08ea26acb775b9b2b152

bmc-vmi-ca/ca_cert_entry.hpp

diff --git a/bmc-vmi-ca/ca_cert_entry.hpp b/bmc-vmi-ca/ca_cert_entry.hpp
index a461632..78f13e8 100644
--- a/bmc-vmi-ca/ca_cert_entry.hpp
+++ b/bmc-vmi-ca/ca_cert_entry.hpp
@@ -45,9 +45,8 @@
      *  @param[in] csr     - csr string
      *  @param[in] cert    - client certificate
      */
-    Entry(sdbusplus::bus::bus& bus, const std::string& objPath,
-          uint32_t entryId, std::string& csr, std::string& cert,
-          CACertMgr& manager) :
+    Entry(sdbusplus::bus_t& bus, const std::string& objPath, uint32_t entryId,
+          std::string& csr, std::string& cert, CACertMgr& manager) :
         internal::EntryInterface(bus, objPath.c_str(),
                                  internal::EntryInterface::action::defer_emit),
         bus(bus), id(entryId), manager(manager)
@@ -64,7 +63,7 @@
 
   protected:
     /** @brief sdbusplus handler */
-    sdbusplus::bus::bus& bus;
+    sdbusplus::bus_t& bus;
     uint32_t id;
     /** @brief object path */
     std::string objectPath;

bmc-vmi-ca/ca_certs_manager.hpp

diff --git a/bmc-vmi-ca/ca_certs_manager.hpp b/bmc-vmi-ca/ca_certs_manager.hpp
index 951c0cf..f99a750 100644
--- a/bmc-vmi-ca/ca_certs_manager.hpp
+++ b/bmc-vmi-ca/ca_certs_manager.hpp
@@ -38,7 +38,7 @@
      *  @param[in] bus - Bus to attach to.
      *  @param[in] path - Path to attach at.
      */
-    CACertMgr(sdbusplus::bus::bus& bus, const char* path) :
+    CACertMgr(sdbusplus::bus_t& bus, const char* path) :
         internal::ManagerInterface(bus, path), bus(bus), objectPath(path),
         lastEntryId(0){};
 
@@ -64,7 +64,7 @@
 
   private:
     /** @brief sdbusplus DBus bus connection. */
-    sdbusplus::bus::bus& bus;
+    sdbusplus::bus_t& bus;
     /** @brief object path */
     std::string objectPath;
     /** @brief Id of the last certificate entry */

bmc-vmi-ca/mainapp.cpp

diff --git a/bmc-vmi-ca/mainapp.cpp b/bmc-vmi-ca/mainapp.cpp
index c33a69d..062a60d 100644
--- a/bmc-vmi-ca/mainapp.cpp
+++ b/bmc-vmi-ca/mainapp.cpp
@@ -11,7 +11,7 @@
     static constexpr auto objPath = "/xyz/openbmc_project/certs/ca";
 
     // Add sdbusplus ObjectManager
-    sdbusplus::server::manager::manager objManager(bus, objPath);
+    sdbusplus::server::manager_t objManager(bus, objPath);
 
     // Get default event loop
     auto event = sdeventplus::Event::get_default();