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
diff --git a/include/image_upload.hpp b/include/image_upload.hpp
index 0fff1ea..4defbb6 100644
--- a/include/image_upload.hpp
+++ b/include/image_upload.hpp
@@ -16,7 +16,7 @@
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 @@
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 @@
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'",