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

4 files changed, 30 insertions, 35 deletions

diff --git a/include/dbus_monitor.hpp b/include/dbus_monitor.hpp
index ce0550d341..129422e4ae 100644
--- a/include/dbus_monitor.hpp
+++ b/include/dbus_monitor.hpp
@@ -18,7 +18,7 @@ namespace dbus_monitor
 
 struct DbusWebsocketSession
 {
-    std::vector<std::unique_ptr<sdbusplus::bus::match::match>> matches;
+    std::vector<std::unique_ptr<sdbusplus::bus::match_t>> matches;
     boost::container::flat_set<std::string, std::less<>,
                                std::vector<std::string>>
         interfaces;
@@ -44,7 +44,7 @@ inline int onPropertyUpdate(sd_bus_message* m, void* userdata,
         BMCWEB_LOG_ERROR << "Couldn't find dbus connection " << connection;
         return 0;
     }
-    sdbusplus::message::message message(m);
+    sdbusplus::message_t message(m);
     nlohmann::json json;
     json["event"] = message.get_member();
     json["path"] = message.get_path();
@@ -206,7 +206,7 @@ inline void requestRoutes(App& app)
                 BMCWEB_LOG_DEBUG << "Creating match " << propertiesMatchString;
 
                 thisSession.matches.emplace_back(
-                    std::make_unique<sdbusplus::bus::match::match>(
+                    std::make_unique<sdbusplus::bus::match_t>(
                         *crow::connections::systemBus, propertiesMatchString,
                         onPropertyUpdate, &conn));
             }
@@ -229,7 +229,7 @@ inline void requestRoutes(App& app)
                     ifaceMatchString += "'";
                     BMCWEB_LOG_DEBUG << "Creating match " << ifaceMatchString;
                     thisSession.matches.emplace_back(
-                        std::make_unique<sdbusplus::bus::match::match>(
+                        std::make_unique<sdbusplus::bus::match_t>(
                             *crow::connections::systemBus, ifaceMatchString,
                             onPropertyUpdate, &conn));
                 }
@@ -243,7 +243,7 @@ inline void requestRoutes(App& app)
                  "member='InterfacesAdded'");
             BMCWEB_LOG_DEBUG << "Creating match " << objectManagerMatchString;
             thisSession.matches.emplace_back(
-                std::make_unique<sdbusplus::bus::match::match>(
+                std::make_unique<sdbusplus::bus::match_t>(
                     *crow::connections::systemBus, objectManagerMatchString,
                     onPropertyUpdate, &conn));
         }
diff --git a/include/hostname_monitor.hpp b/include/hostname_monitor.hpp
index 738dc1b22b..3fb42e49c0 100644
--- a/include/hostname_monitor.hpp
+++ b/include/hostname_monitor.hpp
@@ -11,7 +11,7 @@ namespace crow
 {
 namespace hostname_monitor
 {
-static std::unique_ptr<sdbusplus::bus::match::match> hostnameSignalMonitor;
+static std::unique_ptr<sdbusplus::bus::match_t> hostnameSignalMonitor;
 
 inline void installCertificate(const std::filesystem::path& certPath)
 {
@@ -41,7 +41,7 @@ inline int onPropertyUpdate(sd_bus_message* m, void* /* userdata */,
         return 0;
     }
 
-    sdbusplus::message::message message(m);
+    sdbusplus::message_t message(m);
     std::string iface;
     dbus::utility::DBusPropertiesMap changedProperties;
 
@@ -133,7 +133,7 @@ inline void registerHostnameSignal()
          "arg0='xyz.openbmc_project.Network.SystemConfiguration',"
          "member='PropertiesChanged'");
 
-    hostnameSignalMonitor = std::make_unique<sdbusplus::bus::match::match>(
+    hostnameSignalMonitor = std::make_unique<sdbusplus::bus::match_t>(
         *crow::connections::systemBus, propertiesMatchString, onPropertyUpdate,
         nullptr);
 }
diff --git a/include/image_upload.hpp b/include/image_upload.hpp
index 0fff1ea03f..4defbb6682 100644
--- a/include/image_upload.hpp
+++ b/include/image_upload.hpp
@@ -16,7 +16,7 @@ namespace crow
 namespace image_upload
 {
 
-static std::unique_ptr<sdbusplus::bus::match::match> fwUpdateMatcher;
+static std::unique_ptr<sdbusplus::bus::match_t> fwUpdateMatcher;
 
 inline void
     uploadImageHandler(const crow::Request& req,
@@ -57,8 +57,8 @@ inline void
         asyncResp->res.jsonValue["status"] = "error";
     };
 
-    std::function<void(sdbusplus::message::message&)> callback =
-        [asyncResp](sdbusplus::message::message& m) {
+    std::function<void(sdbusplus::message_t&)> callback =
+        [asyncResp](sdbusplus::message_t& m) {
         BMCWEB_LOG_DEBUG << "Match fired";
 
         sdbusplus::message::object_path path;
@@ -84,7 +84,7 @@ inline void
             fwUpdateMatcher = nullptr;
         }
     };
-    fwUpdateMatcher = std::make_unique<sdbusplus::bus::match::match>(
+    fwUpdateMatcher = std::make_unique<sdbusplus::bus::match_t>(
         *crow::connections::systemBus,
         "interface='org.freedesktop.DBus.ObjectManager',type='signal',"
         "member='InterfacesAdded',path='/xyz/openbmc_project/software'",
diff --git a/include/openbmc_dbus_rest.hpp b/include/openbmc_dbus_rest.hpp
index d4700a379b..9c8d9f5e71 100644
--- a/include/openbmc_dbus_rest.hpp
+++ b/include/openbmc_dbus_rest.hpp
@@ -938,7 +938,7 @@ inline int convertJsonToDbus(sd_bus_message* m, const std::string& argType,
 }
 
 template <typename T>
-int readMessageItem(const std::string& typeCode, sdbusplus::message::message& m,
+int readMessageItem(const std::string& typeCode, sdbusplus::message_t& m,
                     nlohmann::json& data)
 {
     T value;
@@ -955,11 +955,11 @@ int readMessageItem(const std::string& typeCode, sdbusplus::message::message& m,
     return 0;
 }
 
-int convertDBusToJSON(const std::string& returnType,
-                      sdbusplus::message::message& m, nlohmann::json& response);
+int convertDBusToJSON(const std::string& returnType, sdbusplus::message_t& m,
+                      nlohmann::json& response);
 
 inline int readDictEntryFromMessage(const std::string& typeCode,
-                                    sdbusplus::message::message& m,
+                                    sdbusplus::message_t& m,
                                     nlohmann::json& object)
 {
     std::vector<std::string> types = dbusArgSplit(typeCode);
@@ -1018,8 +1018,7 @@ inline int readDictEntryFromMessage(const std::string& typeCode,
 }
 
 inline int readArrayFromMessage(const std::string& typeCode,
-                                sdbusplus::message::message& m,
-                                nlohmann::json& data)
+                                sdbusplus::message_t& m, nlohmann::json& data)
 {
     if (typeCode.size() < 2)
     {
@@ -1098,8 +1097,7 @@ inline int readArrayFromMessage(const std::string& typeCode,
 }
 
 inline int readStructFromMessage(const std::string& typeCode,
-                                 sdbusplus::message::message& m,
-                                 nlohmann::json& data)
+                                 sdbusplus::message_t& m, nlohmann::json& data)
 {
     if (typeCode.size() < 3)
     {
@@ -1139,8 +1137,7 @@ inline int readStructFromMessage(const std::string& typeCode,
     return 0;
 }
 
-inline int readVariantFromMessage(sdbusplus::message::message& m,
-                                  nlohmann::json& data)
+inline int readVariantFromMessage(sdbusplus::message_t& m, nlohmann::json& data)
 {
     const char* containerType = nullptr;
     int r = sd_bus_message_peek_type(m.get(), nullptr, &containerType);
@@ -1176,8 +1173,7 @@ inline int readVariantFromMessage(sdbusplus::message::message& m,
 }
 
 inline int convertDBusToJSON(const std::string& returnType,
-                             sdbusplus::message::message& m,
-                             nlohmann::json& response)
+                             sdbusplus::message_t& m, nlohmann::json& response)
 {
     int r = 0;
     const std::vector<std::string> returnTypes = dbusArgSplit(returnType);
@@ -1317,7 +1313,7 @@ inline int convertDBusToJSON(const std::string& returnType,
 
 inline void handleMethodResponse(
     const std::shared_ptr<InProgressActionData>& transaction,
-    sdbusplus::message::message& m, const std::string& returnType)
+    sdbusplus::message_t& m, const std::string& returnType)
 {
     nlohmann::json data;
 
@@ -1434,7 +1430,7 @@ inline void findActionOnInterface(
                         BMCWEB_LOG_DEBUG << "Found method named "
                                          << thisMethodName << " on interface "
                                          << thisInterfaceName;
-                        sdbusplus::message::message m =
+                        sdbusplus::message_t m =
                             crow::connections::systemBus->new_method_call(
                                 connectionName.c_str(),
                                 transaction->path.c_str(), thisInterfaceName,
@@ -1500,7 +1496,7 @@ inline void findActionOnInterface(
                             m,
                             [transaction,
                              returnType](boost::system::error_code ec2,
-                                         sdbusplus::message::message& m2) {
+                                         sdbusplus::message_t& m2) {
                             if (ec2)
                             {
                                 transaction->methodFailed = true;
@@ -1748,7 +1744,7 @@ inline void handleGet(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
 
             for (const std::string& interface : interfaceNames)
             {
-                sdbusplus::message::message m =
+                sdbusplus::message_t m =
                     crow::connections::systemBus->new_method_call(
                         connection.first.c_str(), path->c_str(),
                         "org.freedesktop.DBus.Properties", "GetAll");
@@ -1756,7 +1752,7 @@ inline void handleGet(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
                 crow::connections::systemBus->async_send(
                     m, [asyncResp, response,
                         propertyName](const boost::system::error_code ec2,
-                                      sdbusplus::message::message& msg) {
+                                      sdbusplus::message_t& msg) {
                         if (ec2)
                         {
                             BMCWEB_LOG_ERROR << "Bad dbus request error: "
@@ -1942,7 +1938,7 @@ inline void handlePut(const crow::Request& req,
                             const char* argType = propNode->Attribute("type");
                             if (argType != nullptr)
                             {
-                                sdbusplus::message::message m =
+                                sdbusplus::message_t m =
                                     crow::connections::systemBus
                                         ->new_method_call(
                                             connectionName.c_str(),
@@ -1988,9 +1984,8 @@ inline void handlePut(const crow::Request& req,
                                 }
                                 crow::connections::systemBus->async_send(
                                     m,
-                                    [transaction](
-                                        boost::system::error_code ec,
-                                        sdbusplus::message::message& m2) {
+                                    [transaction](boost::system::error_code ec,
+                                                  sdbusplus::message_t& m2) {
                                     BMCWEB_LOG_DEBUG << "sent";
                                     if (ec)
                                     {
@@ -2366,7 +2361,7 @@ inline void
                 const char* type = property->Attribute("type");
                 if (type != nullptr && name != nullptr)
                 {
-                    sdbusplus::message::message m =
+                    sdbusplus::message_t m =
                         crow::connections::systemBus->new_method_call(
                             processName.c_str(), objectPath.c_str(),
                             "org.freedesktop."
@@ -2378,7 +2373,7 @@ inline void
                     crow::connections::systemBus->async_send(
                         m, [&propertyItem,
                             asyncResp](const boost::system::error_code& e,
-                                       sdbusplus::message::message& msg) {
+                                       sdbusplus::message_t& msg) {
                             if (e)
                             {
                                 return;