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: I8e2242adb79be342562c9b7f3d2153dfdf578085
diff --git a/oem/ibm/libpldmresponder/inband_code_update.cpp b/oem/ibm/libpldmresponder/inband_code_update.cpp
index dc83af8..980a869 100644
--- a/oem/ibm/libpldmresponder/inband_code_update.cpp
+++ b/oem/ibm/libpldmresponder/inband_code_update.cpp
@@ -190,20 +190,20 @@
using namespace sdbusplus::bus::match::rules;
captureNextBootSideChange.push_back(
- std::make_unique<sdbusplus::bus::match::match>(
+ std::make_unique<sdbusplus::bus::match_t>(
pldm::utils::DBusHandler::getBus(),
propertiesChanged(runningVersion, redundancyIntf),
- [this](sdbusplus::message::message& msg) {
+ [this](sdbusplus::message_t& msg) {
DbusChangedProps props;
std::string iface;
msg.read(iface, props);
processPriorityChangeNotification(props);
}));
- fwUpdateMatcher.push_back(std::make_unique<sdbusplus::bus::match::match>(
+ fwUpdateMatcher.push_back(std::make_unique<sdbusplus::bus::match_t>(
pldm::utils::DBusHandler::getBus(),
"interface='org.freedesktop.DBus.ObjectManager',type='signal',"
"member='InterfacesAdded',path='/xyz/openbmc_project/software'",
- [this](sdbusplus::message::message& msg) {
+ [this](sdbusplus::message_t& msg) {
DBusInterfaceAdded interfaces;
sdbusplus::message::object_path path;
msg.read(path, interfaces);
@@ -230,12 +230,12 @@
if (!imageActivationMatch)
{
imageActivationMatch = std::make_unique<
- sdbusplus::bus::match::match>(
+ sdbusplus::bus::match_t>(
pldm::utils::DBusHandler::getBus(),
propertiesChanged(newImageId,
"xyz.openbmc_project."
"Software.Activation"),
- [this](sdbusplus::message::message& msg) {
+ [this](sdbusplus::message_t& msg) {
DbusChangedProps props;
std::string iface;
msg.read(iface, props);
@@ -306,7 +306,7 @@
break;
}
}
- catch (const sdbusplus::exception::exception& e)
+ catch (const sdbusplus::exception_t& e)
{
std::cerr << "Error in getting Activation status \n";
}