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/Utils.cpp

diff --git a/src/Utils.cpp b/src/Utils.cpp
index 954a5d3..da8cc67 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -39,8 +39,8 @@
 static bool biosHasPost = false;
 static bool manufacturingMode = false;
 
-static std::unique_ptr<sdbusplus::bus::match::match> powerMatch = nullptr;
-static std::unique_ptr<sdbusplus::bus::match::match> postMatch = nullptr;
+static std::unique_ptr<sdbusplus::bus::match_t> powerMatch = nullptr;
+static std::unique_ptr<sdbusplus::bus::match_t> postMatch = nullptr;
 
 /**
  * return the contents of a file
@@ -147,18 +147,18 @@
     if (!useCache)
     {
         managedObj.clear();
-        sdbusplus::message::message getManagedObjects =
+        sdbusplus::message_t getManagedObjects =
             dbusConnection->new_method_call(
                 entityManagerName, "/", "org.freedesktop.DBus.ObjectManager",
                 "GetManagedObjects");
         bool err = false;
         try
         {
-            sdbusplus::message::message reply =
+            sdbusplus::message_t reply =
                 dbusConnection->call(getManagedObjects);
             reply.read(managedObj);
         }
-        catch (const sdbusplus::exception::exception& e)
+        catch (const sdbusplus::exception_t& e)
         {
             std::cerr << "While calling GetManagedObjects on service:"
                       << entityManagerName << " exception name:" << e.name()
@@ -405,12 +405,12 @@
         return;
     }
 
-    powerMatch = std::make_unique<sdbusplus::bus::match::match>(
-        static_cast<sdbusplus::bus::bus&>(*conn),
+    powerMatch = std::make_unique<sdbusplus::bus::match_t>(
+        static_cast<sdbusplus::bus_t&>(*conn),
         "type='signal',interface='" + std::string(properties::interface) +
             "',path='" + std::string(power::path) + "',arg0='" +
             std::string(power::interface) + "'",
-        [](sdbusplus::message::message& message) {
+        [](sdbusplus::message_t& message) {
         std::string objectName;
         boost::container::flat_map<std::string, std::variant<std::string>>
             values;
@@ -443,12 +443,12 @@
         }
         });
 
-    postMatch = std::make_unique<sdbusplus::bus::match::match>(
-        static_cast<sdbusplus::bus::bus&>(*conn),
+    postMatch = std::make_unique<sdbusplus::bus::match_t>(
+        static_cast<sdbusplus::bus_t&>(*conn),
         "type='signal',interface='" + std::string(properties::interface) +
             "',path='" + std::string(post::path) + "',arg0='" +
             std::string(post::interface) + "'",
-        [](sdbusplus::message::message& message) {
+        [](sdbusplus::message_t& message) {
         std::string objectName;
         boost::container::flat_map<std::string, std::variant<std::string>>
             values;
@@ -626,10 +626,10 @@
     const std::string filterSpecialModeIntfAdd =
         rules::interfacesAdded() +
         rules::argNpath(0, "/xyz/openbmc_project/security/special_mode");
-    static std::unique_ptr<sdbusplus::bus::match::match> specialModeIntfMatch =
-        std::make_unique<sdbusplus::bus::match::match>(
-            conn, filterSpecialModeIntfAdd,
-            [](sdbusplus::message::message& m) {
+    static std::unique_ptr<sdbusplus::bus::match_t> specialModeIntfMatch =
+        std::make_unique<sdbusplus::bus::match_t>(conn,
+                                                  filterSpecialModeIntfAdd,
+                                                  [](sdbusplus::message_t& m) {
         sdbusplus::message::object_path path;
         using PropertyMap =
             boost::container::flat_map<std::string, std::variant<std::string>>;
@@ -650,16 +650,15 @@
         }
         auto* manufacturingModeStatus = std::get_if<std::string>(&itr->second);
         handleSpecialModeChange(*manufacturingModeStatus);
-            });
+        });
 
     const std::string filterSpecialModeChange =
         rules::type::signal() + rules::member("PropertiesChanged") +
         rules::interface("org.freedesktop.DBus.Properties") +
         rules::argN(0, specialModeInterface);
-    static std::unique_ptr<sdbusplus::bus::match::match>
-        specialModeChangeMatch = std::make_unique<sdbusplus::bus::match::match>(
-            conn, filterSpecialModeChange,
-            [](sdbusplus::message::message& m) {
+    static std::unique_ptr<sdbusplus::bus::match_t> specialModeChangeMatch =
+        std::make_unique<sdbusplus::bus::match_t>(conn, filterSpecialModeChange,
+                                                  [](sdbusplus::message_t& m) {
         std::string interfaceName;
         boost::container::flat_map<std::string, std::variant<std::string>>
             propertiesChanged;
@@ -672,7 +671,7 @@
         }
         auto* manufacturingModeStatus = std::get_if<std::string>(&itr->second);
         handleSpecialModeChange(*manufacturingModeStatus);
-            });
+        });
 
     conn.async_method_call(
         [](const boost::system::error_code ec,