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: Ibd2a0b512bfb7caf65bfab64b271d194da520aac
diff --git a/dbus-sdr/sdrutils.cpp b/dbus-sdr/sdrutils.cpp
index 7de48a8..abc8671 100644
--- a/dbus-sdr/sdrutils.cpp
+++ b/dbus-sdr/sdrutils.cpp
@@ -36,17 +36,17 @@
static std::shared_ptr<SensorSubTree> sensorTreePtr;
static uint16_t sensorUpdatedIndex = 0;
std::shared_ptr<sdbusplus::asio::connection> dbus = getSdBus();
- static sdbusplus::bus::match::match sensorAdded(
+ static sdbusplus::bus::match_t sensorAdded(
*dbus,
"type='signal',member='InterfacesAdded',arg0path='/xyz/openbmc_project/"
"sensors/'",
- [](sdbusplus::message::message&) { sensorTreePtr.reset(); });
+ [](sdbusplus::message_t&) { sensorTreePtr.reset(); });
- static sdbusplus::bus::match::match sensorRemoved(
+ static sdbusplus::bus::match_t sensorRemoved(
*dbus,
"type='signal',member='InterfacesRemoved',arg0path='/xyz/"
"openbmc_project/sensors/'",
- [](sdbusplus::message::message&) { sensorTreePtr.reset(); });
+ [](sdbusplus::message_t&) { sensorTreePtr.reset(); });
if (sensorTreePtr)
{
@@ -317,7 +317,7 @@
std::vector<std::string> interfaces;
std::shared_ptr<sdbusplus::asio::connection> dbus = getSdBus();
- sdbusplus::message::message getObjectMessage =
+ sdbusplus::message_t getObjectMessage =
dbus->new_method_call("xyz.openbmc_project.ObjectMapper",
"/xyz/openbmc_project/object_mapper",
"xyz.openbmc_project.ObjectMapper", "GetObject");
@@ -325,7 +325,7 @@
try
{
- sdbusplus::message::message response = dbus->call(getObjectMessage);
+ sdbusplus::message_t response = dbus->call(getObjectMessage);
response.read(interfacesResponse);
}
catch (const std::exception& e)
@@ -344,14 +344,14 @@
std::map<std::string, Value> properties;
std::shared_ptr<sdbusplus::asio::connection> dbus = getSdBus();
- sdbusplus::message::message getProperties =
+ sdbusplus::message_t getProperties =
dbus->new_method_call("xyz.openbmc_project.EntityManager", path,
"org.freedesktop.DBus.Properties", "GetAll");
getProperties.append(interface);
try
{
- sdbusplus::message::message response = dbus->call(getProperties);
+ sdbusplus::message_t response = dbus->call(getProperties);
response.read(properties);
}
catch (const std::exception& e)
diff --git a/dbus-sdr/sensorcommands.cpp b/dbus-sdr/sensorcommands.cpp
index 1c19986..522cbb8 100644
--- a/dbus-sdr/sensorcommands.cpp
+++ b/dbus-sdr/sensorcommands.cpp
@@ -111,22 +111,22 @@
void registerSensorFunctions() __attribute__((constructor));
-static sdbusplus::bus::match::match sensorAdded(
+static sdbusplus::bus::match_t sensorAdded(
*getSdBus(),
"type='signal',member='InterfacesAdded',arg0path='/xyz/openbmc_project/"
"sensors/'",
- [](sdbusplus::message::message&) {
+ [](sdbusplus::message_t&) {
getSensorTree().clear();
sdrLastAdd = std::chrono::duration_cast<std::chrono::seconds>(
std::chrono::system_clock::now().time_since_epoch())
.count();
});
-static sdbusplus::bus::match::match sensorRemoved(
+static sdbusplus::bus::match_t sensorRemoved(
*getSdBus(),
"type='signal',member='InterfacesRemoved',arg0path='/xyz/openbmc_project/"
"sensors/'",
- [](sdbusplus::message::message&) {
+ [](sdbusplus::message_t&) {
getSensorTree().clear();
sdrLastRemove = std::chrono::duration_cast<std::chrono::seconds>(
std::chrono::system_clock::now().time_since_epoch())
@@ -139,11 +139,11 @@
std::string, boost::container::flat_map<std::string, std::optional<bool>>>
thresholdDeassertMap;
-static sdbusplus::bus::match::match thresholdChanged(
+static sdbusplus::bus::match_t thresholdChanged(
*getSdBus(),
"type='signal',member='PropertiesChanged',interface='org.freedesktop.DBus."
"Properties',arg0namespace='xyz.openbmc_project.Sensor.Threshold'",
- [](sdbusplus::message::message& m) {
+ [](sdbusplus::message_t& m) {
boost::container::flat_map<std::string, std::variant<bool, double>>
values;
m.read(std::string(), values);
diff --git a/dbus-sdr/storagecommands.cpp b/dbus-sdr/storagecommands.cpp
index b0849ce..6a50edf 100644
--- a/dbus-sdr/storagecommands.cpp
+++ b/dbus-sdr/storagecommands.cpp
@@ -120,7 +120,7 @@
static uint8_t writeAddr = 0XFF;
std::unique_ptr<phosphor::Timer> writeTimer = nullptr;
-static std::vector<sdbusplus::bus::match::match> fruMatches;
+static std::vector<sdbusplus::bus::match_t> fruMatches;
ManagedObjectType frus;
@@ -138,13 +138,13 @@
}
lastDevId = 0xFF;
std::shared_ptr<sdbusplus::asio::connection> dbus = getSdBus();
- sdbusplus::message::message writeFru = dbus->new_method_call(
+ sdbusplus::message_t writeFru = dbus->new_method_call(
fruDeviceServiceName, "/xyz/openbmc_project/FruDevice",
"xyz.openbmc_project.FruDeviceManager", "WriteFru");
writeFru.append(writeBus, writeAddr, fruCache);
try
{
- sdbusplus::message::message writeFruResp = dbus->call(writeFru);
+ sdbusplus::message_t writeFruResp = dbus->call(writeFru);
}
catch (const sdbusplus::exception_t&)
{
@@ -313,7 +313,7 @@
fruMatches.emplace_back(*bus,
"type='signal',arg0path='/xyz/openbmc_project/"
"FruDevice/',member='InterfacesAdded'",
- [](sdbusplus::message::message& message) {
+ [](sdbusplus::message_t& message) {
sdbusplus::message::object_path path;
ObjectType object;
try
@@ -339,7 +339,7 @@
fruMatches.emplace_back(*bus,
"type='signal',arg0path='/xyz/openbmc_project/"
"FruDevice/',member='InterfacesRemoved'",
- [](sdbusplus::message::message& message) {
+ [](sdbusplus::message_t& message) {
sdbusplus::message::object_path path;
std::set<std::string> interfaces;
try
@@ -1164,13 +1164,13 @@
// Reload rsyslog so it knows to start new log files
std::shared_ptr<sdbusplus::asio::connection> dbus = getSdBus();
- sdbusplus::message::message rsyslogReload = dbus->new_method_call(
+ sdbusplus::message_t rsyslogReload = dbus->new_method_call(
"org.freedesktop.systemd1", "/org/freedesktop/systemd1",
"org.freedesktop.systemd1.Manager", "ReloadUnit");
rsyslogReload.append("rsyslog.service", "replace");
try
{
- sdbusplus::message::message reloadResponse = dbus->call(rsyslogReload);
+ sdbusplus::message_t reloadResponse = dbus->call(rsyslogReload);
}
catch (const sdbusplus::exception_t& e)
{