commit 45e8352180af8992aecad88db62647511c776fef
author Patrick Williams <patrick@stwcx.xyz> Fri Jul 22 19:26:52 2022 -0500
committer Patrick Williams <patrick@stwcx.xyz> Mon Jul 25 15:28:17 2022 +0000
tree 2be6c1b969dd013dd79eb7bd18a31d1efcdc450b
parent c8962bda038446e6d09e3f703ca07669c2403c54

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

log_manager.hpp

diff --git a/log_manager.hpp b/log_manager.hpp
index 4863ad5..7ae889e 100644
--- a/log_manager.hpp
+++ b/log_manager.hpp
@@ -26,7 +26,7 @@
 namespace details
 {
 template <typename... T>
-using ServerObject = typename sdbusplus::server::object::object<T...>;
+using ServerObject = typename sdbusplus::server::object_t<T...>;
 
 using ManagerIface =
     sdbusplus::xyz::openbmc_project::Logging::Internal::server::Manager;
@@ -65,7 +65,7 @@
      *  @param[in] bus - Bus to attach to.
      *  @param[in] path - Path to attach at.
      */
-    Manager(sdbusplus::bus::bus& bus, const char* objPath) :
+    Manager(sdbusplus::bus_t& bus, const char* objPath) :
         details::ServerObject<details::ManagerIface>(bus, objPath), busLog(bus),
         entryId(0), fwVersion(readFWVersion()){};
 
@@ -154,9 +154,9 @@
     /**
      * @brief Returns the sdbusplus bus object
      *
-     * @return sdbusplus::bus::bus&
+     * @return sdbusplus::bus_t&
      */
-    sdbusplus::bus::bus& getBus()
+    sdbusplus::bus_t& getBus()
     {
         return busLog;
     }
@@ -300,7 +300,7 @@
      *
      * @param[in] msg - sdbusplus dbusmessage
      */
-    void onEntryResolve(sdbusplus::message::message& msg);
+    void onEntryResolve(sdbusplus::message_t& msg);
 
     /** @brief Remove block objects for any resolved entries  */
     void findAndRemoveResolvedBlocks();
@@ -313,7 +313,7 @@
     void checkAndQuiesceHost();
 
     /** @brief Persistent sdbusplus DBus bus connection. */
-    sdbusplus::bus::bus& busLog;
+    sdbusplus::bus_t& busLog;
 
     /** @brief List of error ids for high severity errors */
     std::list<uint32_t> realErrors;
@@ -331,7 +331,7 @@
     std::vector<std::unique_ptr<Block>> blockingErrors;
 
     /** @brief Map of entry id to call back object on properties changed */
-    std::map<uint32_t, std::unique_ptr<sdbusplus::bus::match::match>>
+    std::map<uint32_t, std::unique_ptr<sdbusplus::bus::match_t>>
         propChangedEntryCallback;
 };
 
@@ -361,7 +361,7 @@
      *  @param[in] path - Path to attach at.
      *  @param[in] manager - Reference to internal manager object.
      */
-    Manager(sdbusplus::bus::bus& bus, const std::string& path,
+    Manager(sdbusplus::bus_t& bus, const std::string& path,
             internal::Manager& manager) :
         details::ServerObject<DeleteAllIface, CreateIface>(
             bus, path.c_str(),