commit 92f8f5156ca6c8e32c1a0e60ed65ea7133025db1
author Patrick Williams <patrick@stwcx.xyz> Fri Jul 22 19:26:55 2022 -0500
committer Ed Tanous <ed@tanous.net> Mon Jul 25 03:26:43 2022 +0000
tree a5a33d03d30c20e73980a5386e1c3129b12af104
parent 2a5e2dca54271949da3e2caa6e073d5361ec2687

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

src/NVMeSensorMain.cpp

diff --git a/src/NVMeSensorMain.cpp b/src/NVMeSensorMain.cpp
index ed46923..dc85f70 100644
--- a/src/NVMeSensorMain.cpp
+++ b/src/NVMeSensorMain.cpp
@@ -190,8 +190,7 @@
     getter->getConfiguration(std::vector<std::string>{NVMeSensor::configType});
 }
 
-static void interfaceRemoved(sdbusplus::message::message& message,
-                             NVMEMap& contexts)
+static void interfaceRemoved(sdbusplus::message_t& message, NVMEMap& contexts)
 {
     if (message.is_method_error())
     {
@@ -234,9 +233,8 @@
     io.post([&]() { createSensors(io, objectServer, systemBus); });
 
     boost::asio::deadline_timer filterTimer(io);
-    std::function<void(sdbusplus::message::message&)> eventHandler =
-        [&filterTimer, &io, &objectServer,
-         &systemBus](sdbusplus::message::message&) {
+    std::function<void(sdbusplus::message_t&)> eventHandler =
+        [&filterTimer, &io, &objectServer, &systemBus](sdbusplus::message_t&) {
         // this implicitly cancels the timer
         filterTimer.expires_from_now(boost::posix_time::seconds(1));
 
@@ -256,8 +254,8 @@
         });
     };
 
-    sdbusplus::bus::match::match configMatch(
-        static_cast<sdbusplus::bus::bus&>(*systemBus),
+    sdbusplus::bus::match_t configMatch(
+        static_cast<sdbusplus::bus_t&>(*systemBus),
         "type='signal',member='PropertiesChanged',path_namespace='" +
             std::string(inventoryPath) + "',arg0namespace='" +
             std::string(NVMeSensor::configType) + "'",
@@ -265,11 +263,11 @@
 
     // Watch for entity-manager to remove configuration interfaces
     // so the corresponding sensors can be removed.
-    auto ifaceRemovedMatch = std::make_unique<sdbusplus::bus::match::match>(
-        static_cast<sdbusplus::bus::bus&>(*systemBus),
+    auto ifaceRemovedMatch = std::make_unique<sdbusplus::bus::match_t>(
+        static_cast<sdbusplus::bus_t&>(*systemBus),
         "type='signal',member='InterfacesRemoved',arg0path='" +
             std::string(inventoryPath) + "/'",
-        [](sdbusplus::message::message& msg) {
+        [](sdbusplus::message_t& msg) {
         interfaceRemoved(msg, nvmeDeviceMap);
         });