commit cd315e07175bfb0676ffd51a1d4928850926f157
author Patrick Williams <patrick@stwcx.xyz> Fri Jul 22 19:26:52 2022 -0500
committer Patrick Williams <patrick@stwcx.xyz> Mon Aug 01 17:17:53 2022 +0000
tree 81f51faae5a31a09ec76375f582a1ddb1d8d1adc
parent d532feca9360a2f93b763a38ce41aec13d29e35b

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

src/oemcommands.cpp

diff --git a/src/oemcommands.cpp b/src/oemcommands.cpp
index 577f513..6d7829a 100644
--- a/src/oemcommands.cpp
+++ b/src/oemcommands.cpp
@@ -50,7 +50,7 @@
 
 size_t getSelectorPosition();
 static void registerOEMFunctions() __attribute__((constructor));
-sdbusplus::bus::bus dbus(ipmid_get_sd_bus_connection()); // from ipmid/api.h
+sdbusplus::bus_t dbus(ipmid_get_sd_bus_connection()); // from ipmid/api.h
 static constexpr size_t maxFRUStringLength = 0x3F;
 constexpr uint8_t cmdSetSystemGuid = 0xEF;
 
@@ -111,8 +111,7 @@
     return address.find(IPV4_PREFIX) == 0 || address.find(IPV6_PREFIX) == 0;
 }
 
-DbusObjectInfo getIPObject(sdbusplus::bus::bus& bus,
-                           const std::string& interface,
+DbusObjectInfo getIPObject(sdbusplus::bus_t& bus, const std::string& interface,
                            const std::string& serviceRoot,
                            const std::string& match)
 {
@@ -268,7 +267,7 @@
 ipmi_ret_t getNetworkData(uint8_t lan_param, char* data)
 {
     ipmi_ret_t rc = IPMI_CC_OK;
-    sdbusplus::bus::bus bus(ipmid_get_sd_bus_connection());
+    sdbusplus::bus_t bus(ipmid_get_sd_bus_connection());
 
     const std::string ethdevice = "eth0";
 
@@ -373,7 +372,7 @@
         sd_bus_unref(bus);
         return -1;
     }
-    sdbusplus::bus::bus dbus(bus);
+    sdbusplus::bus_t dbus(bus);
     auto mapperCall = dbus.new_method_call("xyz.openbmc_project.ObjectMapper",
                                            "/xyz/openbmc_project/object_mapper",
                                            "xyz.openbmc_project.ObjectMapper",