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: Ie8ecdadfa03f1f7a4a369b6981a360009fe71420
diff --git a/bmc/general_systemd.hpp b/bmc/general_systemd.hpp
index 9b33460..4df4747 100644
--- a/bmc/general_systemd.hpp
+++ b/bmc/general_systemd.hpp
@@ -15,11 +15,10 @@
{
public:
static std::unique_ptr<TriggerableActionInterface>
- CreateSystemdNoFile(sdbusplus::bus::bus&& bus,
- const std::string& service,
+ CreateSystemdNoFile(sdbusplus::bus_t&& bus, const std::string& service,
const std::string& mode);
- SystemdNoFile(sdbusplus::bus::bus&& bus, const std::string& service,
+ SystemdNoFile(sdbusplus::bus_t&& bus, const std::string& service,
const std::string& mode) :
bus(std::move(bus)),
triggerService(service), mode(mode)
@@ -38,15 +37,15 @@
const std::string& getMode() const;
private:
- sdbusplus::bus::bus bus;
+ sdbusplus::bus_t bus;
const std::string triggerService;
const std::string mode;
- std::optional<sdbusplus::bus::match::match> jobMonitor;
+ std::optional<sdbusplus::bus::match_t> jobMonitor;
std::optional<std::string> job;
ActionStatus currentStatus = ActionStatus::unknown;
- void match(sdbusplus::message::message& m);
+ void match(sdbusplus::message_t& m);
};
/**
@@ -67,12 +66,12 @@
* @param[in] mode - the job-mode when starting the systemd Unit.
*/
static std::unique_ptr<TriggerableActionInterface>
- CreateSystemdWithStatusFile(sdbusplus::bus::bus&& bus,
+ CreateSystemdWithStatusFile(sdbusplus::bus_t&& bus,
const std::string& path,
const std::string& service,
const std::string& mode);
- SystemdWithStatusFile(sdbusplus::bus::bus&& bus, const std::string& path,
+ SystemdWithStatusFile(sdbusplus::bus_t&& bus, const std::string& path,
const std::string& service, const std::string& mode) :
SystemdNoFile(std::move(bus), service, mode),
checkPath(path)