commit bbfe718674d930f35b48c4a6646d0f8bac5901a9
author Patrick Williams <patrick@stwcx.xyz> Fri Jul 22 19:26:56 2022 -0500
committer Patrick Williams <patrick@stwcx.xyz> Wed Jul 27 22:01:03 2022 +0000
tree 269b4d290c295c4e1c15178ec62ea02136c0c33b
parent 85f31f8ba3f5f93cf75ae18dd813307f4b611cf7

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

healthMonitor.cpp

diff --git a/healthMonitor.cpp b/healthMonitor.cpp
index 3523b79..05f9cbc 100644
--- a/healthMonitor.cpp
+++ b/healthMonitor.cpp
@@ -417,7 +417,7 @@
         return;
     }
 
-    sdbusplus::message::message msg = bus.new_method_call(
+    sdbusplus::message_t msg = bus.new_method_call(
         "org.freedesktop.systemd1", "/org/freedesktop/systemd1",
         "org.freedesktop.systemd1.Manager", "StartUnit");
     msg.append(sysdUnit, "replace");
@@ -436,7 +436,7 @@
             // Find all BMCs (DBus objects implementing the
             // Inventory.Item.Bmc interface that may be created by
             // configuring the Inventory Manager)
-            sdbusplus::message::message msg = bus.new_method_call(
+            sdbusplus::message_t msg = bus.new_method_call(
                 "xyz.openbmc_project.ObjectMapper",
                 "/xyz/openbmc_project/object_mapper",
                 "xyz.openbmc_project.ObjectMapper", "GetSubTreePaths");
@@ -454,7 +454,7 @@
             msg.append(std::vector<std::string>{
                 "xyz.openbmc_project.Inventory.Item.Bmc"});
 
-            sdbusplus::message::message reply = bus.call(msg, 0);
+            sdbusplus::message_t reply = bus.call(msg, 0);
             reply.read(bmcIds);
             info("BMC inventory found");
         }
@@ -640,11 +640,11 @@
 
     // If the SystemInventory does not exist: wait for the InterfaceAdded signal
     auto interfacesAddedSignalHandler =
-        std::make_unique<sdbusplus::bus::match::match>(
-            static_cast<sdbusplus::bus::bus&>(*conn),
+        std::make_unique<sdbusplus::bus::match_t>(
+            static_cast<sdbusplus::bus_t&>(*conn),
             sdbusplus::bus::match::rules::interfacesAdded(
                 phosphor::health::BMCActivationPath),
-            [conn](sdbusplus::message::message& msg) {
+            [conn](sdbusplus::message_t& msg) {
                 sdbusplus::message::object_path o;
                 msg.read(o);
                 if (!needUpdate && o.str == phosphor::health::BMCActivationPath)