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: I5bc54a17954f74651bff4fbdd7f7dd7e7cfb084e
diff --git a/src/server.cpp b/src/server.cpp
index 836ac43..5b41c05 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -13,19 +13,19 @@
namespace kcsbridge
{
-void setAttention(sdbusplus::message::message& m, stdplus::Fd& kcs)
+void setAttention(sdbusplus::message_t& m, stdplus::Fd& kcs)
{
stdplus::fd::ioctl(kcs, IPMI_BMC_IOCTL_SET_SMS_ATN, nullptr);
m.new_method_return().method_return();
}
-void clearAttention(sdbusplus::message::message& m, stdplus::Fd& kcs)
+void clearAttention(sdbusplus::message_t& m, stdplus::Fd& kcs)
{
stdplus::fd::ioctl(kcs, IPMI_BMC_IOCTL_CLEAR_SMS_ATN, nullptr);
m.new_method_return().method_return();
}
-void forceAbort(sdbusplus::message::message& m, stdplus::Fd& kcs)
+void forceAbort(sdbusplus::message_t& m, stdplus::Fd& kcs)
{
stdplus::fd::ioctl(kcs, IPMI_BMC_IOCTL_FORCE_ABORT, nullptr);
m.new_method_return().method_return();
@@ -34,7 +34,7 @@
template <auto func, typename Data>
int methodRsp(sd_bus_message* mptr, void* dataptr, sd_bus_error* error) noexcept
{
- sdbusplus::message::message m(mptr);
+ sdbusplus::message_t m(mptr);
try
{
func(m, *reinterpret_cast<Data*>(dataptr));
@@ -61,8 +61,9 @@
sdbusplus::vtable::end(),
};
-sdbusplus::server::interface::interface createSMSHandler(
- sdbusplus::bus::bus& bus, const char* obj, stdplus::Fd& kcs)
+sdbusplus::server::interface::interface createSMSHandler(sdbusplus::bus_t& bus,
+ const char* obj,
+ stdplus::Fd& kcs)
{
return sdbusplus::server::interface::interface(
bus, obj, "xyz.openbmc_project.Ipmi.Channel.SMS",