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: I768b8efcac262ef07cf75f06486c6144c090e91a
diff --git a/manager.cpp b/manager.cpp
index c04b59b..fd421f0 100644
--- a/manager.cpp
+++ b/manager.cpp
@@ -30,7 +30,7 @@
namespace fs = std::experimental::filesystem;
using namespace phosphor::logging;
-Manager::Manager(sdbusplus::bus::bus& bus) :
+Manager::Manager(sdbusplus::bus_t& bus) :
bus(bus),
addMatch(bus,
sdbusplus::bus::match::rules::interfacesAdded() +
@@ -68,7 +68,7 @@
}
}
}
- catch (const sdbusplus::exception::exception& e)
+ catch (const sdbusplus::exception_t& e)
{
log<level::ERR>("sdbusplus error getting logging managed objects",
entry("ERROR=%s", e.what()));
@@ -250,7 +250,7 @@
addChildInterface(objectPath, InterfaceType::CALLOUT, anyObject);
calloutNum++;
}
- catch (const sdbusplus::exception::exception& e)
+ catch (const sdbusplus::exception_t& e)
{
log<level::ERR>("sdbusplus exception", entry("ERROR=%s", e.what()));
}
@@ -294,7 +294,7 @@
}
}
-void Manager::interfaceAdded(sdbusplus::message::message& msg)
+void Manager::interfaceAdded(sdbusplus::message_t& msg)
{
sdbusplus::message::object_path path;
DbusInterfaceMap interfaces;
@@ -340,7 +340,7 @@
return fs::path{objectPath} / "callouts" / std::to_string(calloutNum);
}
-void Manager::interfaceRemoved(sdbusplus::message::message& msg)
+void Manager::interfaceRemoved(sdbusplus::message_t& msg)
{
sdbusplus::message::object_path path;
DbusInterfaceList interfaces;