commit 7354ce62a992703872fc565ebfbeb00ca2c975e3
author Patrick Williams <patrick@stwcx.xyz> Fri Jul 22 19:26:56 2022 -0500
committer Shawn McCarney <shawnmm@us.ibm.com> Tue Jul 26 19:30:38 2022 +0000
tree b96237a0bf9e434e5380bf873125ca94aed5a7e2
parent cfee4d0e43ca82ecdf405de763a146ac9ba2474e

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: Ief05bd757cffb1453e058a719ee4b060861752e7

utility.hpp

diff --git a/utility.hpp b/utility.hpp
index 31684ac..1db17f3 100644
--- a/utility.hpp
+++ b/utility.hpp
@@ -44,7 +44,7 @@
  * @return The service name
  */
 std::string getService(const std::string& path, const std::string& interface,
-                       sdbusplus::bus::bus& bus, bool logError = true);
+                       sdbusplus::bus_t& bus, bool logError = true);
 
 /**
  * @brief Read a D-Bus property
@@ -59,7 +59,7 @@
 template <typename T>
 void getProperty(const std::string& interface, const std::string& propertyName,
                  const std::string& path, const std::string& service,
-                 sdbusplus::bus::bus& bus, T& value)
+                 sdbusplus::bus_t& bus, T& value)
 {
     std::variant<T> property;
 
@@ -87,7 +87,7 @@
 template <typename T>
 void setProperty(const std::string& interface, const std::string& propertyName,
                  const std::string& path, const std::string& service,
-                 sdbusplus::bus::bus& bus, T& value)
+                 sdbusplus::bus_t& bus, T& value)
 {
     std::variant<T> propertyValue(value);
 
@@ -109,8 +109,7 @@
  *
  * @return DbusPropertyMap - Map of property names and values
  */
-DbusPropertyMap getAllProperties(sdbusplus::bus::bus& bus,
-                                 const std::string& path,
+DbusPropertyMap getAllProperties(sdbusplus::bus_t& bus, const std::string& path,
                                  const std::string& interface,
                                  const std::string& service = std::string());
 
@@ -128,7 +127,7 @@
  * @return DbusSubtree - Map of object paths to a map of service names to their
  *                       interfaces.
  */
-DbusSubtree getSubTree(sdbusplus::bus::bus& bus, const std::string& path,
+DbusSubtree getSubTree(sdbusplus::bus_t& bus, const std::string& path,
                        const std::string& interface, int32_t depth);
 
 /**
@@ -138,7 +137,7 @@
  * @param[in] bus - D-Bus object
  */
 template <typename T>
-void powerOff(sdbusplus::bus::bus& bus)
+void powerOff(sdbusplus::bus_t& bus)
 {
     phosphor::logging::report<T>();
 
@@ -179,7 +178,7 @@
  * @return true if power is on, otherwise false;
  *         defaultState if it fails to get the power state.
  */
-bool isPoweredOn(sdbusplus::bus::bus& bus, bool defaultState = false);
+bool isPoweredOn(sdbusplus::bus_t& bus, bool defaultState = false);
 
 /**
  * Get all PSU inventory paths from D-Bus
@@ -188,7 +187,7 @@
  *
  * @return The list of PSU inventory paths
  */
-std::vector<std::string> getPSUInventoryPaths(sdbusplus::bus::bus& bus);
+std::vector<std::string> getPSUInventoryPaths(sdbusplus::bus_t& bus);
 
 } // namespace util
 } // namespace power