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/chassishandler.cpp b/chassishandler.cpp
index 9b2eb2a..c2ed807 100644
--- a/chassishandler.cpp
+++ b/chassishandler.cpp
@@ -142,7 +142,7 @@
constexpr auto powerRestoreIntf =
"xyz.openbmc_project.Control.Power.RestorePolicy";
-sdbusplus::bus::bus dbus(ipmid_get_sd_bus_connection());
+sdbusplus::bus_t dbus(ipmid_get_sd_bus_connection());
namespace cache
{
@@ -187,7 +187,7 @@
// as SETTINGS_MATCH.
// Later SETTINGS_MATCH will be replaced with busname.
- sdbusplus::bus::bus bus(ipmid_get_sd_bus_connection());
+ sdbusplus::bus_t bus(ipmid_get_sd_bus_connection());
auto ipObjectInfo = ipmi::getDbusObject(bus, IP_INTERFACE,
SETTINGS_ROOT, SETTINGS_MATCH);
@@ -529,7 +529,7 @@
",mac="s + mac + ",addressOrigin="s +
addressOrigin;
- sdbusplus::bus::bus bus(ipmid_get_sd_bus_connection());
+ sdbusplus::bus_t bus(ipmid_get_sd_bus_connection());
auto ipObjectInfo = ipmi::getDbusObject(bus, IP_INTERFACE,
SETTINGS_ROOT, SETTINGS_MATCH);
@@ -565,7 +565,7 @@
uint32_t getPOHCounter()
{
- sdbusplus::bus::bus bus{ipmid_get_sd_bus_connection()};
+ sdbusplus::bus_t bus{ipmid_get_sd_bus_connection()};
auto chassisStateObj =
ipmi::getDbusObject(bus, chassisPOHStateIntf, chassisStateRoot, match);
@@ -606,7 +606,7 @@
ipmi::PropertyMap properties;
try
{
- sdbusplus::bus::bus bus{ipmid_get_sd_bus_connection()};
+ sdbusplus::bus_t bus{ipmid_get_sd_bus_connection()};
ipmi::DbusObjectInfo chassisCapObject =
ipmi::getDbusObject(bus, chassisCapIntf);
@@ -773,7 +773,7 @@
try
{
- sdbusplus::bus::bus bus(ipmid_get_sd_bus_connection());
+ sdbusplus::bus_t bus(ipmid_get_sd_bus_connection());
ipmi::DbusObjectInfo chassisCapObject =
ipmi::getDbusObject(bus, chassisCapIntf);
@@ -1062,7 +1062,7 @@
buttonIntf, "Enabled");
buttonDisabled = !std::get<bool>(enabled);
}
- catch (const sdbusplus::exception::exception& e)
+ catch (const sdbusplus::exception_t& e)
{
log<level::ERR>("Fail to get button Enabled property",
entry("PATH=%s", buttonPath.c_str()),