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/file_io.hpp b/oem/ibm/libpldmresponder/file_io.hpp
index ee8074d..b1fe17c 100644
--- a/oem/ibm/libpldmresponder/file_io.hpp
+++ b/oem/ibm/libpldmresponder/file_io.hpp
@@ -229,12 +229,12 @@
payloadLength);
});
- resDumpMatcher = std::make_unique<sdbusplus::bus::match::match>(
+ resDumpMatcher = std::make_unique<sdbusplus::bus::match_t>(
pldm::utils::DBusHandler::getBus(),
sdbusplus::bus::match::rules::interfacesAdded() +
sdbusplus::bus::match::rules::argNpath(0, dumpObjPath),
[this, hostSockFd, hostEid, dbusImplReqester,
- handler](sdbusplus::message::message& msg) {
+ handler](sdbusplus::message_t& msg) {
std::map<
std::string,
std::map<std::string, std::variant<std::string, uint32_t>>>
@@ -272,12 +272,12 @@
}
}
});
- vmiCertMatcher = std::make_unique<sdbusplus::bus::match::match>(
+ vmiCertMatcher = std::make_unique<sdbusplus::bus::match_t>(
pldm::utils::DBusHandler::getBus(),
sdbusplus::bus::match::rules::interfacesAdded() +
sdbusplus::bus::match::rules::argNpath(0, certObjPath),
[this, hostSockFd, hostEid, dbusImplReqester,
- handler](sdbusplus::message::message& msg) {
+ handler](sdbusplus::message_t& msg) {
std::map<
std::string,
std::map<std::string, std::variant<std::string, uint32_t>>>
@@ -422,10 +422,10 @@
std::vector<std::pair<std::string, std::variant<std::string>>>>>;
std::unique_ptr<pldm::requester::oem_ibm::DbusToFileHandler>
dbusToFileHandler; //!< pointer to send request to Host
- std::unique_ptr<sdbusplus::bus::match::match>
+ std::unique_ptr<sdbusplus::bus::match_t>
resDumpMatcher; //!< Pointer to capture the interface added signal
//!< for new resource dump
- std::unique_ptr<sdbusplus::bus::match::match>
+ std::unique_ptr<sdbusplus::bus::match_t>
vmiCertMatcher; //!< Pointer to capture the interface added signal
//!< for new csr string
/** @brief PLDM request handler */
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";
}
diff --git a/oem/ibm/libpldmresponder/inband_code_update.hpp b/oem/ibm/libpldmresponder/inband_code_update.hpp
index 7832579..9c7f41c 100644
--- a/oem/ibm/libpldmresponder/inband_code_update.hpp
+++ b/oem/ibm/libpldmresponder/inband_code_update.hpp
@@ -186,10 +186,10 @@
bool codeUpdateInProgress =
false; //!< indicates whether codeupdate is going on
const pldm::utils::DBusHandler* dBusIntf; //!< D-Bus handler
- std::vector<std::unique_ptr<sdbusplus::bus::match::match>>
+ std::vector<std::unique_ptr<sdbusplus::bus::match_t>>
captureNextBootSideChange; //!< vector to catch the D-Bus property
//!< change for next boot side
- std::vector<std::unique_ptr<sdbusplus::bus::match::match>>
+ std::vector<std::unique_ptr<sdbusplus::bus::match_t>>
fwUpdateMatcher; //!< pointer to capture the interface added signal for
//!< new image
pldm::responder::oem_platform::Handler*
@@ -198,7 +198,7 @@
uint16_t firmwareUpdateSensorId;
/** @brief D-Bus property changed signal match for image activation */
- std::unique_ptr<sdbusplus::bus::match::match> imageActivationMatch;
+ std::unique_ptr<sdbusplus::bus::match_t> imageActivationMatch;
/* @brief Method to take action when the subscribed D-Bus property is
* changed
diff --git a/oem/ibm/libpldmresponder/oem_ibm_handler.cpp b/oem/ibm/libpldmresponder/oem_ibm_handler.cpp
index 1b803dd..0881869 100644
--- a/oem/ibm/libpldmresponder/oem_ibm_handler.cpp
+++ b/oem/ibm/libpldmresponder/oem_ibm_handler.cpp
@@ -439,11 +439,11 @@
}
using namespace sdbusplus::bus::match::rules;
- chassisOffMatch = std::make_unique<sdbusplus::bus::match::match>(
+ chassisOffMatch = std::make_unique<sdbusplus::bus::match_t>(
pldm::utils::DBusHandler::getBus(),
propertiesChanged("/xyz/openbmc_project/state/chassis0",
"xyz.openbmc_project.State.Chassis"),
- [this](sdbusplus::message::message& msg) {
+ [this](sdbusplus::message_t& msg) {
DbusChangedProps props{};
std::string intf;
msg.read(intf, props);
diff --git a/oem/ibm/libpldmresponder/oem_ibm_handler.hpp b/oem/ibm/libpldmresponder/oem_ibm_handler.hpp
index ce69cf1..6c1983c 100644
--- a/oem/ibm/libpldmresponder/oem_ibm_handler.hpp
+++ b/oem/ibm/libpldmresponder/oem_ibm_handler.hpp
@@ -41,11 +41,11 @@
setEventReceiverCnt = 0;
using namespace sdbusplus::bus::match::rules;
- hostOffMatch = std::make_unique<sdbusplus::bus::match::match>(
+ hostOffMatch = std::make_unique<sdbusplus::bus::match_t>(
pldm::utils::DBusHandler::getBus(),
propertiesChanged("/xyz/openbmc_project/state/host0",
"xyz.openbmc_project.State.Host"),
- [this](sdbusplus::message::message& msg) {
+ [this](sdbusplus::message_t& msg) {
pldm::utils::DbusChangedProps props{};
std::string intf;
msg.read(intf, props);
@@ -208,13 +208,13 @@
private:
/** @brief D-Bus property changed signal match for CurrentPowerState*/
- std::unique_ptr<sdbusplus::bus::match::match> chassisOffMatch;
+ std::unique_ptr<sdbusplus::bus::match_t> chassisOffMatch;
/** @brief PLDM request handler */
pldm::requester::Handler<pldm::requester::Request>* handler;
/** @brief D-Bus property changed signal match */
- std::unique_ptr<sdbusplus::bus::match::match> hostOffMatch;
+ std::unique_ptr<sdbusplus::bus::match_t> hostOffMatch;
bool hostOff = true;
diff --git a/oem/ibm/libpldmresponder/platform_oem_ibm.cpp b/oem/ibm/libpldmresponder/platform_oem_ibm.cpp
index 73e6c85..7639e54 100644
--- a/oem/ibm/libpldmresponder/platform_oem_ibm.cpp
+++ b/oem/ibm/libpldmresponder/platform_oem_ibm.cpp
@@ -42,7 +42,7 @@
return PLDM_SUCCESS;
}
}
- catch (const sdbusplus::exception::exception& e)
+ catch (const sdbusplus::exception_t& e)
{
std::cerr << "Error in getting current host state, continue ... \n";
}
diff --git a/oem/ibm/test/libpldmresponder_oem_platform_test.cpp b/oem/ibm/test/libpldmresponder_oem_platform_test.cpp
index e9d02aa..5ad4fe2 100644
--- a/oem/ibm/test/libpldmresponder_oem_platform_test.cpp
+++ b/oem/ibm/test/libpldmresponder_oem_platform_test.cpp
@@ -53,7 +53,7 @@
uint16_t entityInstance_ = 0;
uint8_t compSensorCnt_ = 1;
uint16_t effecterId = 0xA;
- sdbusplus::bus::bus bus(sdbusplus::bus::new_default());
+ sdbusplus::bus_t bus(sdbusplus::bus::new_default());
Requester requester(bus, "/abc/def");
auto event = sdeventplus::Event::get_default();
std::vector<get_sensor_state_field> stateField;
@@ -186,7 +186,7 @@
TEST(generateStateEffecterOEMPDR, testGoodRequest)
{
auto inPDRRepo = pldm_pdr_init();
- sdbusplus::bus::bus bus(sdbusplus::bus::new_default());
+ sdbusplus::bus_t bus(sdbusplus::bus::new_default());
Requester requester(bus, "/abc/def");
auto mockDbusHandler = std::make_unique<MockdBusHandler>();
auto event = sdeventplus::Event::get_default();
@@ -291,7 +291,7 @@
TEST(generateStateSensorOEMPDR, testGoodRequest)
{
auto inPDRRepo = pldm_pdr_init();
- sdbusplus::bus::bus bus(sdbusplus::bus::new_default());
+ sdbusplus::bus_t bus(sdbusplus::bus::new_default());
Requester requester(bus, "/abc/def");
auto mockDbusHandler = std::make_unique<MockdBusHandler>();