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/user_channel/channel_mgmt.cpp b/user_channel/channel_mgmt.cpp
index 96776df..7d3cf95 100644
--- a/user_channel/channel_mgmt.cpp
+++ b/user_channel/channel_mgmt.cpp
@@ -349,7 +349,7 @@
sdbusplus::bus::match::rules::interface(
dBusPropertiesInterface) +
sdbusplus::bus::match::rules::argN(0, networkChConfigIntfName),
- [&](sdbusplus::message::message& msg) {
+ [&](sdbusplus::message_t& msg) {
DbusChObjProperties props;
std::string iface;
std::string path = msg.get_path();
@@ -364,7 +364,7 @@
sdbusplus::bus::match::rules::member(interfaceAddedSignal) +
sdbusplus::bus::match::rules::argNpath(
0, std::string(networkIntfObjectBasePath) + "/"),
- [&](sdbusplus::message::message&) { initChannelPersistData(); });
+ [&](sdbusplus::message_t&) { initChannelPersistData(); });
chInterfaceRemovedSignal = std::make_unique<sdbusplus::bus::match_t>(
bus,
@@ -372,7 +372,7 @@
sdbusplus::bus::match::rules::member(interfaceRemovedSignal) +
sdbusplus::bus::match::rules::argNpath(
0, std::string(networkIntfObjectBasePath) + "/"),
- [&](sdbusplus::message::message&) { initChannelPersistData(); });
+ [&](sdbusplus::message_t&) { initChannelPersistData(); });
}
}
@@ -649,7 +649,7 @@
return ccUnspecifiedError;
}
}
- catch (const sdbusplus::exception::exception& e)
+ catch (const sdbusplus::exception_t& e)
{
log<level::ERR>("Exception: Network interface does not exist");
return ccInvalidFieldRequest;
@@ -1321,7 +1321,7 @@
auto reply = bus.call(method);
}
- catch (const sdbusplus::exception::exception& e)
+ catch (const sdbusplus::exception_t& e)
{
log<level::DEBUG>("set-property failed",
entry("SERVICE=%s", service.c_str()),
@@ -1351,7 +1351,7 @@
auto reply = bus.call(method);
reply.read(value);
}
- catch (const sdbusplus::exception::exception& e)
+ catch (const sdbusplus::exception_t& e)
{
log<level::DEBUG>("get-property failed",
entry("SERVICE=%s", service.c_str()),
@@ -1396,7 +1396,7 @@
"exception: Network interface does not exist");
continue;
}
- catch (const sdbusplus::exception::exception& e)
+ catch (const sdbusplus::exception_t& e)
{
log<level::DEBUG>(
"exception: Network interface does not exist");