commit ccef2276c29e87a91bbb797ea9483fb247bfe3f2
author Patrick Williams <patrick@stwcx.xyz> Fri Jul 22 19:26:54 2022 -0500
committer Patrick Williams <patrick@stwcx.xyz> Fri Jul 22 19:26:54 2022 -0500
tree d4f9ff51ac252491eaa0a3218bedf604ecd583a2
parent 9d3c6a1b6ef1c4ddc0c82b8c036f0c7d3578287a

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

include/threshold_alarm_event_monitor.hpp

diff --git a/include/threshold_alarm_event_monitor.hpp b/include/threshold_alarm_event_monitor.hpp
index 21cd29d..0de281d 100644
--- a/include/threshold_alarm_event_monitor.hpp
+++ b/include/threshold_alarm_event_monitor.hpp
@@ -23,7 +23,7 @@
 #include <string_view>
 #include <variant>
 
-using sdbusMatch = std::shared_ptr<sdbusplus::bus::match::match>;
+using sdbusMatch = std::shared_ptr<sdbusplus::bus::match_t>;
 static sdbusMatch warningLowAssertedMatcher;
 static sdbusMatch warningLowDeassertedMatcher;
 static sdbusMatch warningHighAssertedMatcher;
@@ -45,7 +45,7 @@
 
 void generateEvent(std::string signalName,
                    std::shared_ptr<sdbusplus::asio::connection> conn,
-                   sdbusplus::message::message& msg)
+                   sdbusplus::message_t& msg)
 {
     double assertValue;
     try
@@ -152,7 +152,7 @@
                     thresholdEventDataTriggerReadingByte3;
 
     // Get the sensor reading to put in the event data
-    sdbusplus::message::message getSensorValue =
+    sdbusplus::message_t getSensorValue =
         conn->new_method_call(msg.get_sender(), msg.get_path(),
                               "org.freedesktop.DBus.Properties", "GetAll");
     getSensorValue.append("xyz.openbmc_project.Sensor.Value");
@@ -160,8 +160,7 @@
         sensorValue;
     try
     {
-        sdbusplus::message::message getSensorValueResp =
-            conn->call(getSensorValue);
+        sdbusplus::message_t getSensorValueResp = conn->call(getSensorValue);
         getSensorValueResp.read(sensorValue);
     }
     catch (const sdbusplus::exception_t&)
@@ -194,14 +193,14 @@
     }
 
     // Get the threshold value to put in the event data
-    sdbusplus::message::message getThreshold =
+    sdbusplus::message_t getThreshold =
         conn->new_method_call(msg.get_sender(), msg.get_path(),
                               "org.freedesktop.DBus.Properties", "Get");
     getThreshold.append(thresholdInterface, event);
     std::variant<double, int64_t> thresholdValue;
     try
     {
-        sdbusplus::message::message getThresholdResp = conn->call(getThreshold);
+        sdbusplus::message_t getThresholdResp = conn->call(getThreshold);
         getThresholdResp.read(thresholdValue);
     }
     catch (const sdbusplus::exception_t&)
@@ -251,10 +250,10 @@
 {
     for (auto iter = matchers.begin(); iter != matchers.end(); iter++)
     {
-        iter->second = std::make_shared<sdbusplus::bus::match::match>(
-            static_cast<sdbusplus::bus::bus&>(*conn),
+        iter->second = std::make_shared<sdbusplus::bus::match_t>(
+            static_cast<sdbusplus::bus_t&>(*conn),
             "type='signal',member=" + iter->first,
-            [conn, iter](sdbusplus::message::message& msg) {
+            [conn, iter](sdbusplus::message_t& msg) {
                 generateEvent(iter->first, conn, msg);
             });
     }