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: Ieb6587e32446a758676f67d9c868289cc02e50bf
diff --git a/src/ADCSensorMain.cpp b/src/ADCSensorMain.cpp
index fe8334d..80838bf 100644
--- a/src/ADCSensorMain.cpp
+++ b/src/ADCSensorMain.cpp
@@ -316,7 +316,7 @@
systemBus->request_name("xyz.openbmc_project.ADCSensor");
sdbusplus::asio::object_server objectServer(systemBus);
boost::container::flat_map<std::string, std::shared_ptr<ADCSensor>> sensors;
- std::vector<std::unique_ptr<sdbusplus::bus::match::match>> matches;
+ std::vector<std::unique_ptr<sdbusplus::bus::match_t>> matches;
auto sensorsChanged =
std::make_shared<boost::container::flat_set<std::string>>();
@@ -326,8 +326,8 @@
});
boost::asio::deadline_timer filterTimer(io);
- std::function<void(sdbusplus::message::message&)> eventHandler =
- [&](sdbusplus::message::message& message) {
+ std::function<void(sdbusplus::message_t&)> eventHandler =
+ [&](sdbusplus::message_t& message) {
if (message.is_method_error())
{
std::cerr << "callback method error\n";
@@ -353,8 +353,8 @@
});
};
- std::function<void(sdbusplus::message::message&)> cpuPresenceHandler =
- [&](sdbusplus::message::message& message) {
+ std::function<void(sdbusplus::message_t&)> cpuPresenceHandler =
+ [&](sdbusplus::message_t& message) {
std::string path = message.get_path();
boost::to_lower(path);
@@ -403,15 +403,15 @@
for (const char* type : sensorTypes)
{
- auto match = std::make_unique<sdbusplus::bus::match::match>(
- static_cast<sdbusplus::bus::bus&>(*systemBus),
+ auto match = std::make_unique<sdbusplus::bus::match_t>(
+ static_cast<sdbusplus::bus_t&>(*systemBus),
"type='signal',member='PropertiesChanged',path_namespace='" +
std::string(inventoryPath) + "',arg0namespace='" + type + "'",
eventHandler);
matches.emplace_back(std::move(match));
}
- matches.emplace_back(std::make_unique<sdbusplus::bus::match::match>(
- static_cast<sdbusplus::bus::bus&>(*systemBus),
+ matches.emplace_back(std::make_unique<sdbusplus::bus::match_t>(
+ static_cast<sdbusplus::bus_t&>(*systemBus),
"type='signal',member='PropertiesChanged',path_namespace='" +
std::string(cpuInventoryPath) +
"',arg0namespace='xyz.openbmc_project.Inventory.Item'",
diff --git a/src/CPUSensorMain.cpp b/src/CPUSensorMain.cpp
index 681fb9f..e9e6433 100644
--- a/src/CPUSensorMain.cpp
+++ b/src/CPUSensorMain.cpp
@@ -715,7 +715,7 @@
boost::container::flat_set<CPUConfig> cpuConfigs;
sdbusplus::asio::object_server objectServer(systemBus);
- std::vector<std::unique_ptr<sdbusplus::bus::match::match>> matches;
+ std::vector<std::unique_ptr<sdbusplus::bus::match_t>> matches;
boost::asio::deadline_timer pingTimer(io);
boost::asio::deadline_timer creationTimer(io);
boost::asio::deadline_timer filterTimer(io);
@@ -735,8 +735,8 @@
}
});
- std::function<void(sdbusplus::message::message&)> eventHandler =
- [&](sdbusplus::message::message& message) {
+ std::function<void(sdbusplus::message_t&)> eventHandler =
+ [&](sdbusplus::message_t& message) {
if (message.is_method_error())
{
std::cerr << "callback method error\n";
@@ -767,8 +767,8 @@
for (const char* type : sensorTypes)
{
- auto match = std::make_unique<sdbusplus::bus::match::match>(
- static_cast<sdbusplus::bus::bus&>(*systemBus),
+ auto match = std::make_unique<sdbusplus::bus::match_t>(
+ static_cast<sdbusplus::bus_t&>(*systemBus),
"type='signal',member='PropertiesChanged',path_namespace='" +
std::string(inventoryPath) + "',arg0namespace='" +
configPrefix + type + "'",
diff --git a/src/ExitAirTempSensor.cpp b/src/ExitAirTempSensor.cpp
index 8f4f76b..a13b1c5 100644
--- a/src/ExitAirTempSensor.cpp
+++ b/src/ExitAirTempSensor.cpp
@@ -63,13 +63,13 @@
static std::vector<std::shared_ptr<CFMSensor>> cfmSensors;
static void setupSensorMatch(
- std::vector<sdbusplus::bus::match::match>& matches,
- sdbusplus::bus::bus& connection, const std::string& type,
- std::function<void(const double&, sdbusplus::message::message&)>&& callback)
+ std::vector<sdbusplus::bus::match_t>& matches, sdbusplus::bus_t& connection,
+ const std::string& type,
+ std::function<void(const double&, sdbusplus::message_t&)>&& callback)
{
- std::function<void(sdbusplus::message::message & message)> eventHandler =
- [callback{std::move(callback)}](sdbusplus::message::message& message) {
+ std::function<void(sdbusplus::message_t & message)> eventHandler =
+ [callback{std::move(callback)}](sdbusplus::message_t& message) {
std::string objectName;
boost::container::flat_map<std::string, std::variant<double, int64_t>>
values;
@@ -196,7 +196,7 @@
std::weak_ptr<CFMSensor> weakRef = weak_from_this();
setupSensorMatch(
matches, *dbusConnection, "fan_tach",
- [weakRef](const double& value, sdbusplus::message::message& message) {
+ [weakRef](const double& value, sdbusplus::message_t& message) {
auto self = weakRef.lock();
if (!self)
{
@@ -246,7 +246,7 @@
"freedesktop.DBus.Properties',path='" +
std::string(cfmSettingPath) + "',arg0='" +
std::string(cfmSettingIface) + "'",
- [weakRef](sdbusplus::message::message& message) {
+ [weakRef](sdbusplus::message_t& message) {
auto self = weakRef.lock();
if (!self)
{
@@ -541,7 +541,7 @@
{
setupSensorMatch(matches, *dbusConnection, type,
[weakRef, type](const double& value,
- sdbusplus::message::message& message) {
+ sdbusplus::message_t& message) {
auto self = weakRef.lock();
if (!self)
{
@@ -947,14 +947,14 @@
sdbusplus::asio::object_server objectServer(systemBus);
std::shared_ptr<ExitAirTempSensor> sensor =
nullptr; // wait until we find the config
- std::vector<std::unique_ptr<sdbusplus::bus::match::match>> matches;
+ std::vector<std::unique_ptr<sdbusplus::bus::match_t>> matches;
io.post([&]() { createSensor(objectServer, sensor, systemBus); });
boost::asio::deadline_timer configTimer(io);
- std::function<void(sdbusplus::message::message&)> eventHandler =
- [&](sdbusplus::message::message&) {
+ std::function<void(sdbusplus::message_t&)> eventHandler =
+ [&](sdbusplus::message_t&) {
configTimer.expires_from_now(boost::posix_time::seconds(1));
// create a timer because normally multiple properties change
configTimer.async_wait([&](const boost::system::error_code& ec) {
@@ -971,8 +971,8 @@
};
for (const char* type : monitorIfaces)
{
- auto match = std::make_unique<sdbusplus::bus::match::match>(
- static_cast<sdbusplus::bus::bus&>(*systemBus),
+ auto match = std::make_unique<sdbusplus::bus::match_t>(
+ static_cast<sdbusplus::bus_t&>(*systemBus),
"type='signal',member='PropertiesChanged',path_namespace='" +
std::string(inventoryPath) + "',arg0namespace='" + type + "'",
eventHandler);
diff --git a/src/ExternalSensorMain.cpp b/src/ExternalSensorMain.cpp
index 0a42274..afde3e8 100644
--- a/src/ExternalSensorMain.cpp
+++ b/src/ExternalSensorMain.cpp
@@ -345,7 +345,7 @@
sdbusplus::asio::object_server objectServer(systemBus);
boost::container::flat_map<std::string, std::shared_ptr<ExternalSensor>>
sensors;
- std::vector<std::unique_ptr<sdbusplus::bus::match::match>> matches;
+ std::vector<std::unique_ptr<sdbusplus::bus::match_t>> matches;
auto sensorsChanged =
std::make_shared<boost::container::flat_set<std::string>>();
boost::asio::steady_timer reaperTimer(io);
@@ -355,9 +355,9 @@
});
boost::asio::deadline_timer filterTimer(io);
- std::function<void(sdbusplus::message::message&)> eventHandler =
+ std::function<void(sdbusplus::message_t&)> eventHandler =
[&objectServer, &sensors, &systemBus, &sensorsChanged, &filterTimer,
- &reaperTimer](sdbusplus::message::message& message) mutable {
+ &reaperTimer](sdbusplus::message_t& message) mutable {
if (message.is_method_error())
{
std::cerr << "callback method error\n";
@@ -392,8 +392,8 @@
});
};
- auto match = std::make_unique<sdbusplus::bus::match::match>(
- static_cast<sdbusplus::bus::bus&>(*systemBus),
+ auto match = std::make_unique<sdbusplus::bus::match_t>(
+ static_cast<sdbusplus::bus_t&>(*systemBus),
"type='signal',member='PropertiesChanged',path_namespace='" +
std::string(inventoryPath) + "',arg0namespace='" + sensorType + "'",
eventHandler);
diff --git a/src/FanMain.cpp b/src/FanMain.cpp
index c55757c..9367aac 100644
--- a/src/FanMain.cpp
+++ b/src/FanMain.cpp
@@ -521,7 +521,7 @@
tachSensors;
boost::container::flat_map<std::string, std::unique_ptr<PwmSensor>>
pwmSensors;
- std::vector<std::unique_ptr<sdbusplus::bus::match::match>> matches;
+ std::vector<std::unique_ptr<sdbusplus::bus::match_t>> matches;
auto sensorsChanged =
std::make_shared<boost::container::flat_set<std::string>>();
@@ -531,8 +531,8 @@
});
boost::asio::deadline_timer filterTimer(io);
- std::function<void(sdbusplus::message::message&)> eventHandler =
- [&](sdbusplus::message::message& message) {
+ std::function<void(sdbusplus::message_t&)> eventHandler =
+ [&](sdbusplus::message_t& message) {
if (message.is_method_error())
{
std::cerr << "callback method error\n";
@@ -560,8 +560,8 @@
for (const char* type : sensorTypes)
{
- auto match = std::make_unique<sdbusplus::bus::match::match>(
- static_cast<sdbusplus::bus::bus&>(*systemBus),
+ auto match = std::make_unique<sdbusplus::bus::match_t>(
+ static_cast<sdbusplus::bus_t&>(*systemBus),
"type='signal',member='PropertiesChanged',path_namespace='" +
std::string(inventoryPath) + "',arg0namespace='" + type + "'",
eventHandler);
@@ -569,13 +569,12 @@
}
// redundancy sensor
- std::function<void(sdbusplus::message::message&)> redundancyHandler =
- [&tachSensors, &systemBus,
- &objectServer](sdbusplus::message::message&) {
+ std::function<void(sdbusplus::message_t&)> redundancyHandler =
+ [&tachSensors, &systemBus, &objectServer](sdbusplus::message_t&) {
createRedundancySensor(tachSensors, systemBus, objectServer);
};
- auto match = std::make_unique<sdbusplus::bus::match::match>(
- static_cast<sdbusplus::bus::bus&>(*systemBus),
+ auto match = std::make_unique<sdbusplus::bus::match_t>(
+ static_cast<sdbusplus::bus_t&>(*systemBus),
"type='signal',member='PropertiesChanged',path_namespace='" +
std::string(inventoryPath) + "',arg0namespace='" +
redundancyConfiguration + "'",
diff --git a/src/HwmonTempMain.cpp b/src/HwmonTempMain.cpp
index d1d50d6..7649cb7 100644
--- a/src/HwmonTempMain.cpp
+++ b/src/HwmonTempMain.cpp
@@ -483,7 +483,7 @@
}
void interfaceRemoved(
- sdbusplus::message::message& message,
+ sdbusplus::message_t& message,
boost::container::flat_map<std::string, std::shared_ptr<HwmonTempSensor>>&
sensors)
{
@@ -524,7 +524,7 @@
sdbusplus::asio::object_server objectServer(systemBus);
boost::container::flat_map<std::string, std::shared_ptr<HwmonTempSensor>>
sensors;
- std::vector<std::unique_ptr<sdbusplus::bus::match::match>> matches;
+ std::vector<std::unique_ptr<sdbusplus::bus::match_t>> matches;
auto sensorsChanged =
std::make_shared<boost::container::flat_set<std::string>>();
@@ -533,8 +533,8 @@
});
boost::asio::deadline_timer filterTimer(io);
- std::function<void(sdbusplus::message::message&)> eventHandler =
- [&](sdbusplus::message::message& message) {
+ std::function<void(sdbusplus::message_t&)> eventHandler =
+ [&](sdbusplus::message_t& message) {
if (message.is_method_error())
{
std::cerr << "callback method error\n";
@@ -561,8 +561,8 @@
for (const char* type : sensorTypes)
{
- auto match = std::make_unique<sdbusplus::bus::match::match>(
- static_cast<sdbusplus::bus::bus&>(*systemBus),
+ auto match = std::make_unique<sdbusplus::bus::match_t>(
+ static_cast<sdbusplus::bus_t&>(*systemBus),
"type='signal',member='PropertiesChanged',path_namespace='" +
std::string(inventoryPath) + "',arg0namespace='" + type + "'",
eventHandler);
@@ -573,11 +573,11 @@
// Watch for entity-manager to remove configuration interfaces
// so the corresponding sensors can be removed.
- auto ifaceRemovedMatch = std::make_unique<sdbusplus::bus::match::match>(
- static_cast<sdbusplus::bus::bus&>(*systemBus),
+ auto ifaceRemovedMatch = std::make_unique<sdbusplus::bus::match_t>(
+ static_cast<sdbusplus::bus_t&>(*systemBus),
"type='signal',member='InterfacesRemoved',arg0path='" +
std::string(inventoryPath) + "/'",
- [&sensors](sdbusplus::message::message& msg) {
+ [&sensors](sdbusplus::message_t& msg) {
interfaceRemoved(msg, sensors);
});
diff --git a/src/IntrusionSensorMain.cpp b/src/IntrusionSensorMain.cpp
index 5d2b666..2745c08 100644
--- a/src/IntrusionSensorMain.cpp
+++ b/src/IntrusionSensorMain.cpp
@@ -230,7 +230,7 @@
std::vector<std::string>{nicTypes.begin(), nicTypes.end()});
}
-static void processLanStatusChange(sdbusplus::message::message& message)
+static void processLanStatusChange(sdbusplus::message_t& message)
{
const std::string& pathName = message.get_path();
std::string interfaceName;
@@ -442,8 +442,8 @@
}
// callback to handle configuration change
- std::function<void(sdbusplus::message::message&)> eventHandler =
- [&](sdbusplus::message::message& message) {
+ std::function<void(sdbusplus::message_t&)> eventHandler =
+ [&](sdbusplus::message_t& message) {
if (message.is_method_error())
{
std::cerr << "callback method error\n";
@@ -458,8 +458,8 @@
}
};
- auto eventMatch = std::make_unique<sdbusplus::bus::match::match>(
- static_cast<sdbusplus::bus::bus&>(*systemBus),
+ auto eventMatch = std::make_unique<sdbusplus::bus::match_t>(
+ static_cast<sdbusplus::bus_t&>(*systemBus),
"type='signal',member='PropertiesChanged',path_namespace='" +
std::string(inventoryPath) + "',arg0namespace='" + sensorType + "'",
eventHandler);
@@ -467,22 +467,20 @@
if (initializeLanStatus(systemBus))
{
// add match to monitor lan status change
- sdbusplus::bus::match::match lanStatusMatch(
- static_cast<sdbusplus::bus::bus&>(*systemBus),
+ sdbusplus::bus::match_t lanStatusMatch(
+ static_cast<sdbusplus::bus_t&>(*systemBus),
"type='signal', member='PropertiesChanged',"
"arg0namespace='org.freedesktop.network1.Link'",
- [](sdbusplus::message::message& msg) {
- processLanStatusChange(msg);
- });
+ [](sdbusplus::message_t& msg) { processLanStatusChange(msg); });
// add match to monitor entity manager signal about nic name config
// change
- sdbusplus::bus::match::match lanConfigMatch(
- static_cast<sdbusplus::bus::bus&>(*systemBus),
+ sdbusplus::bus::match_t lanConfigMatch(
+ static_cast<sdbusplus::bus_t&>(*systemBus),
"type='signal', member='PropertiesChanged',path_namespace='" +
std::string(inventoryPath) + "',arg0namespace='" + nicType +
"'",
- [&systemBus](sdbusplus::message::message& msg) {
+ [&systemBus](sdbusplus::message_t& msg) {
if (msg.is_method_error())
{
std::cerr << "callback method error\n";
diff --git a/src/IpmbSensor.cpp b/src/IpmbSensor.cpp
index 69c1e46..88f6bb3 100644
--- a/src/IpmbSensor.cpp
+++ b/src/IpmbSensor.cpp
@@ -569,7 +569,7 @@
"GetManagedObjects");
}
-void reinitSensors(sdbusplus::message::message& message)
+void reinitSensors(sdbusplus::message_t& message)
{
constexpr const size_t reinitWaitSeconds = 2;
std::string objectName;
@@ -625,8 +625,8 @@
boost::asio::deadline_timer configTimer(io);
- std::function<void(sdbusplus::message::message&)> eventHandler =
- [&](sdbusplus::message::message&) {
+ std::function<void(sdbusplus::message_t&)> eventHandler =
+ [&](sdbusplus::message_t&) {
configTimer.expires_from_now(boost::posix_time::seconds(1));
// create a timer because normally multiple properties change
configTimer.async_wait([&](const boost::system::error_code& ec) {
@@ -642,15 +642,15 @@
});
};
- sdbusplus::bus::match::match configMatch(
- static_cast<sdbusplus::bus::bus&>(*systemBus),
+ sdbusplus::bus::match_t configMatch(
+ static_cast<sdbusplus::bus_t&>(*systemBus),
"type='signal',member='PropertiesChanged',path_namespace='" +
std::string(inventoryPath) + "',arg0namespace='" + configInterface +
"'",
eventHandler);
- sdbusplus::bus::match::match powerChangeMatch(
- static_cast<sdbusplus::bus::bus&>(*systemBus),
+ sdbusplus::bus::match_t powerChangeMatch(
+ static_cast<sdbusplus::bus_t&>(*systemBus),
"type='signal',interface='" + std::string(properties::interface) +
"',path='" + std::string(power::path) + "',arg0='" +
std::string(power::interface) + "'",
diff --git a/src/MCUTempSensor.cpp b/src/MCUTempSensor.cpp
index 68b6df3..b856bdb 100644
--- a/src/MCUTempSensor.cpp
+++ b/src/MCUTempSensor.cpp
@@ -273,8 +273,8 @@
boost::asio::deadline_timer configTimer(io);
- std::function<void(sdbusplus::message::message&)> eventHandler =
- [&](sdbusplus::message::message&) {
+ std::function<void(sdbusplus::message_t&)> eventHandler =
+ [&](sdbusplus::message_t&) {
configTimer.expires_from_now(boost::posix_time::seconds(1));
// create a timer because normally multiple properties change
configTimer.async_wait([&](const boost::system::error_code& ec) {
@@ -296,8 +296,8 @@
});
};
- sdbusplus::bus::match::match configMatch(
- static_cast<sdbusplus::bus::bus&>(*systemBus),
+ sdbusplus::bus::match_t configMatch(
+ static_cast<sdbusplus::bus_t&>(*systemBus),
"type='signal',member='PropertiesChanged',"
"path_namespace='" +
std::string(inventoryPath) +
diff --git a/src/NVMeSensorMain.cpp b/src/NVMeSensorMain.cpp
index ed46923..dc85f70 100644
--- a/src/NVMeSensorMain.cpp
+++ b/src/NVMeSensorMain.cpp
@@ -190,8 +190,7 @@
getter->getConfiguration(std::vector<std::string>{NVMeSensor::configType});
}
-static void interfaceRemoved(sdbusplus::message::message& message,
- NVMEMap& contexts)
+static void interfaceRemoved(sdbusplus::message_t& message, NVMEMap& contexts)
{
if (message.is_method_error())
{
@@ -234,9 +233,8 @@
io.post([&]() { createSensors(io, objectServer, systemBus); });
boost::asio::deadline_timer filterTimer(io);
- std::function<void(sdbusplus::message::message&)> eventHandler =
- [&filterTimer, &io, &objectServer,
- &systemBus](sdbusplus::message::message&) {
+ std::function<void(sdbusplus::message_t&)> eventHandler =
+ [&filterTimer, &io, &objectServer, &systemBus](sdbusplus::message_t&) {
// this implicitly cancels the timer
filterTimer.expires_from_now(boost::posix_time::seconds(1));
@@ -256,8 +254,8 @@
});
};
- sdbusplus::bus::match::match configMatch(
- static_cast<sdbusplus::bus::bus&>(*systemBus),
+ sdbusplus::bus::match_t configMatch(
+ static_cast<sdbusplus::bus_t&>(*systemBus),
"type='signal',member='PropertiesChanged',path_namespace='" +
std::string(inventoryPath) + "',arg0namespace='" +
std::string(NVMeSensor::configType) + "'",
@@ -265,11 +263,11 @@
// Watch for entity-manager to remove configuration interfaces
// so the corresponding sensors can be removed.
- auto ifaceRemovedMatch = std::make_unique<sdbusplus::bus::match::match>(
- static_cast<sdbusplus::bus::bus&>(*systemBus),
+ auto ifaceRemovedMatch = std::make_unique<sdbusplus::bus::match_t>(
+ static_cast<sdbusplus::bus_t&>(*systemBus),
"type='signal',member='InterfacesRemoved',arg0path='" +
std::string(inventoryPath) + "/'",
- [](sdbusplus::message::message& msg) {
+ [](sdbusplus::message_t& msg) {
interfaceRemoved(msg, nvmeDeviceMap);
});
diff --git a/src/PSUSensorMain.cpp b/src/PSUSensorMain.cpp
index 0e4deea..0084b55 100644
--- a/src/PSUSensorMain.cpp
+++ b/src/PSUSensorMain.cpp
@@ -1068,7 +1068,7 @@
systemBus->request_name("xyz.openbmc_project.PSUSensor");
sdbusplus::asio::object_server objectServer(systemBus);
- std::vector<std::unique_ptr<sdbusplus::bus::match::match>> matches;
+ std::vector<std::unique_ptr<sdbusplus::bus::match_t>> matches;
auto sensorsChanged =
std::make_shared<boost::container::flat_set<std::string>>();
@@ -1076,8 +1076,8 @@
io.post([&]() { createSensors(io, objectServer, systemBus, nullptr); });
boost::asio::deadline_timer filterTimer(io);
- std::function<void(sdbusplus::message::message&)> eventHandler =
- [&](sdbusplus::message::message& message) {
+ std::function<void(sdbusplus::message_t&)> eventHandler =
+ [&](sdbusplus::message_t& message) {
if (message.is_method_error())
{
std::cerr << "callback method error\n";
@@ -1100,8 +1100,8 @@
for (const char* type : sensorTypes)
{
- auto match = std::make_unique<sdbusplus::bus::match::match>(
- static_cast<sdbusplus::bus::bus&>(*systemBus),
+ auto match = std::make_unique<sdbusplus::bus::match_t>(
+ static_cast<sdbusplus::bus_t&>(*systemBus),
"type='signal',member='PropertiesChanged',path_namespace='" +
std::string(inventoryPath) + "',arg0namespace='" + type + "'",
eventHandler);
diff --git a/src/Thresholds.cpp b/src/Thresholds.cpp
index ae7718e..7805dff 100644
--- a/src/Thresholds.cpp
+++ b/src/Thresholds.cpp
@@ -456,14 +456,14 @@
try
{
// msg.get_path() is interface->get_object_path()
- sdbusplus::message::message msg =
+ sdbusplus::message_t msg =
interface->new_signal("ThresholdAsserted");
msg.append(sensor->name, interface->get_interface_name(), property,
assert, assertValue);
msg.signal_send();
}
- catch (const sdbusplus::exception::exception& e)
+ catch (const sdbusplus::exception_t& e)
{
std::cerr
<< "Failed to send thresholdAsserted signal with assertValue\n";
diff --git a/src/Utils.cpp b/src/Utils.cpp
index 954a5d3..da8cc67 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -39,8 +39,8 @@
static bool biosHasPost = false;
static bool manufacturingMode = false;
-static std::unique_ptr<sdbusplus::bus::match::match> powerMatch = nullptr;
-static std::unique_ptr<sdbusplus::bus::match::match> postMatch = nullptr;
+static std::unique_ptr<sdbusplus::bus::match_t> powerMatch = nullptr;
+static std::unique_ptr<sdbusplus::bus::match_t> postMatch = nullptr;
/**
* return the contents of a file
@@ -147,18 +147,18 @@
if (!useCache)
{
managedObj.clear();
- sdbusplus::message::message getManagedObjects =
+ sdbusplus::message_t getManagedObjects =
dbusConnection->new_method_call(
entityManagerName, "/", "org.freedesktop.DBus.ObjectManager",
"GetManagedObjects");
bool err = false;
try
{
- sdbusplus::message::message reply =
+ sdbusplus::message_t reply =
dbusConnection->call(getManagedObjects);
reply.read(managedObj);
}
- catch (const sdbusplus::exception::exception& e)
+ catch (const sdbusplus::exception_t& e)
{
std::cerr << "While calling GetManagedObjects on service:"
<< entityManagerName << " exception name:" << e.name()
@@ -405,12 +405,12 @@
return;
}
- powerMatch = std::make_unique<sdbusplus::bus::match::match>(
- static_cast<sdbusplus::bus::bus&>(*conn),
+ powerMatch = std::make_unique<sdbusplus::bus::match_t>(
+ static_cast<sdbusplus::bus_t&>(*conn),
"type='signal',interface='" + std::string(properties::interface) +
"',path='" + std::string(power::path) + "',arg0='" +
std::string(power::interface) + "'",
- [](sdbusplus::message::message& message) {
+ [](sdbusplus::message_t& message) {
std::string objectName;
boost::container::flat_map<std::string, std::variant<std::string>>
values;
@@ -443,12 +443,12 @@
}
});
- postMatch = std::make_unique<sdbusplus::bus::match::match>(
- static_cast<sdbusplus::bus::bus&>(*conn),
+ postMatch = std::make_unique<sdbusplus::bus::match_t>(
+ static_cast<sdbusplus::bus_t&>(*conn),
"type='signal',interface='" + std::string(properties::interface) +
"',path='" + std::string(post::path) + "',arg0='" +
std::string(post::interface) + "'",
- [](sdbusplus::message::message& message) {
+ [](sdbusplus::message_t& message) {
std::string objectName;
boost::container::flat_map<std::string, std::variant<std::string>>
values;
@@ -626,10 +626,10 @@
const std::string filterSpecialModeIntfAdd =
rules::interfacesAdded() +
rules::argNpath(0, "/xyz/openbmc_project/security/special_mode");
- static std::unique_ptr<sdbusplus::bus::match::match> specialModeIntfMatch =
- std::make_unique<sdbusplus::bus::match::match>(
- conn, filterSpecialModeIntfAdd,
- [](sdbusplus::message::message& m) {
+ static std::unique_ptr<sdbusplus::bus::match_t> specialModeIntfMatch =
+ std::make_unique<sdbusplus::bus::match_t>(conn,
+ filterSpecialModeIntfAdd,
+ [](sdbusplus::message_t& m) {
sdbusplus::message::object_path path;
using PropertyMap =
boost::container::flat_map<std::string, std::variant<std::string>>;
@@ -650,16 +650,15 @@
}
auto* manufacturingModeStatus = std::get_if<std::string>(&itr->second);
handleSpecialModeChange(*manufacturingModeStatus);
- });
+ });
const std::string filterSpecialModeChange =
rules::type::signal() + rules::member("PropertiesChanged") +
rules::interface("org.freedesktop.DBus.Properties") +
rules::argN(0, specialModeInterface);
- static std::unique_ptr<sdbusplus::bus::match::match>
- specialModeChangeMatch = std::make_unique<sdbusplus::bus::match::match>(
- conn, filterSpecialModeChange,
- [](sdbusplus::message::message& m) {
+ static std::unique_ptr<sdbusplus::bus::match_t> specialModeChangeMatch =
+ std::make_unique<sdbusplus::bus::match_t>(conn, filterSpecialModeChange,
+ [](sdbusplus::message_t& m) {
std::string interfaceName;
boost::container::flat_map<std::string, std::variant<std::string>>
propertiesChanged;
@@ -672,7 +671,7 @@
}
auto* manufacturingModeStatus = std::get_if<std::string>(&itr->second);
handleSpecialModeChange(*manufacturingModeStatus);
- });
+ });
conn.async_method_call(
[](const boost::system::error_code ec,