commit 5d82f47406aa1b17d55c851677a15e5d3f62f31e
author Patrick Williams <patrick@stwcx.xyz> Fri Jul 22 19:26:53 2022 -0500
committer Patrick Williams <patrick@stwcx.xyz> Mon Aug 01 14:49:59 2022 +0000
tree 1718dcaf1cf9450825bf5e36813314ff17542d3c
parent 7d7a685865422c2a461052b3062596f192573c83

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

storagehandler.cpp

diff --git a/storagehandler.cpp b/storagehandler.cpp
index 47a18d6..34ca0b9 100644
--- a/storagehandler.cpp
+++ b/storagehandler.cpp
@@ -72,11 +72,11 @@
 
 SELCacheMap selCacheMap __attribute__((init_priority(101)));
 bool selCacheMapInitialized;
-std::unique_ptr<sdbusplus::bus::match::match> selAddedMatch
+std::unique_ptr<sdbusplus::bus::match_t> selAddedMatch
     __attribute__((init_priority(101)));
-std::unique_ptr<sdbusplus::bus::match::match> selRemovedMatch
+std::unique_ptr<sdbusplus::bus::match_t> selRemovedMatch
     __attribute__((init_priority(101)));
-std::unique_ptr<sdbusplus::bus::match::match> selUpdatedMatch
+std::unique_ptr<sdbusplus::bus::match_t> selUpdatedMatch
     __attribute__((init_priority(101)));
 
 static inline uint16_t getLoggingId(const std::string& p)
@@ -109,14 +109,14 @@
     return std::nullopt;
 }
 
-static void selAddedCallback(sdbusplus::message::message& m)
+static void selAddedCallback(sdbusplus::message_t& m)
 {
     sdbusplus::message::object_path objPath;
     try
     {
         m.read(objPath);
     }
-    catch (const sdbusplus::exception::exception& e)
+    catch (const sdbusplus::exception_t& e)
     {
         log<level::ERR>("Failed to read object path");
         return;
@@ -129,14 +129,14 @@
     }
 }
 
-static void selRemovedCallback(sdbusplus::message::message& m)
+static void selRemovedCallback(sdbusplus::message_t& m)
 {
     sdbusplus::message::object_path objPath;
     try
     {
         m.read(objPath);
     }
-    catch (const sdbusplus::exception::exception& e)
+    catch (const sdbusplus::exception_t& e)
     {
         log<level::ERR>("Failed to read object path");
     }
@@ -151,7 +151,7 @@
     }
 }
 
-static void selUpdatedCallback(sdbusplus::message::message& m)
+static void selUpdatedCallback(sdbusplus::message_t& m)
 {
     std::string p = m.get_path();
     auto entry = parseLoggingEntry(p);
@@ -164,22 +164,22 @@
 void registerSelCallbackHandler()
 {
     using namespace sdbusplus::bus::match::rules;
-    sdbusplus::bus::bus bus{ipmid_get_sd_bus_connection()};
+    sdbusplus::bus_t bus{ipmid_get_sd_bus_connection()};
     if (!selAddedMatch)
     {
-        selAddedMatch = std::make_unique<sdbusplus::bus::match::match>(
+        selAddedMatch = std::make_unique<sdbusplus::bus::match_t>(
             bus, interfacesAdded(logWatchPath),
             std::bind(selAddedCallback, std::placeholders::_1));
     }
     if (!selRemovedMatch)
     {
-        selRemovedMatch = std::make_unique<sdbusplus::bus::match::match>(
+        selRemovedMatch = std::make_unique<sdbusplus::bus::match_t>(
             bus, interfacesRemoved(logWatchPath),
             std::bind(selRemovedCallback, std::placeholders::_1));
     }
     if (!selUpdatedMatch)
     {
-        selUpdatedMatch = std::make_unique<sdbusplus::bus::match::match>(
+        selUpdatedMatch = std::make_unique<sdbusplus::bus::match_t>(
             bus,
             type::signal() + member("PropertiesChanged"s) +
                 interface("org.freedesktop.DBus.Properties"s) +
@@ -196,7 +196,7 @@
     {
         ipmi::sel::readLoggingObjectPaths(paths);
     }
-    catch (const sdbusplus::exception::exception& e)
+    catch (const sdbusplus::exception_t& e)
     {
         log<level::ERR>("Failed to get logging object paths");
         return;
@@ -451,7 +451,7 @@
         return ipmi::responseSensorInvalid();
     }
 
-    sdbusplus::bus::bus bus{ipmid_get_sd_bus_connection()};
+    sdbusplus::bus_t bus{ipmid_get_sd_bus_connection()};
     std::string service;
 
     auto objPath = getLoggingObjPath(iter->first);
@@ -515,7 +515,7 @@
     // Per the IPMI spec, need to cancel any reservation when the SEL is cleared
     cancelSELReservation();
 
-    sdbusplus::bus::bus bus{ipmid_get_sd_bus_connection()};
+    sdbusplus::bus_t bus{ipmid_get_sd_bus_connection()};
     auto service = ipmi::getService(bus, ipmi::sel::logIntf, ipmi::sel::logObj);
     auto method =
         bus.new_method_call(service.c_str(), ipmi::sel::logObj,
@@ -524,7 +524,7 @@
     {
         bus.call_noreply(method);
     }
-    catch (const sdbusplus::exception::exception& e)
+    catch (const sdbusplus::exception_t& e)
     {
         log<level::ERR>("Error eraseAll ", entry("ERROR=%s", e.what()));
         return ipmi::responseUnspecifiedError();
@@ -547,7 +547,7 @@
 
     try
     {
-        sdbusplus::bus::bus bus{ipmid_get_sd_bus_connection()};
+        sdbusplus::bus_t bus{ipmid_get_sd_bus_connection()};
         auto service = ipmi::getService(bus, TIME_INTERFACE, BMC_TIME_PATH);
         std::variant<uint64_t> value;
 
@@ -601,7 +601,7 @@
 
     try
     {
-        sdbusplus::bus::bus bus{ipmid_get_sd_bus_connection()};
+        sdbusplus::bus_t bus{ipmid_get_sd_bus_connection()};
         bool ntp = std::get<bool>(
             ipmi::getDbusProperty(bus, SystemdTimeService, SystemdTimePath,
                                   SystemdTimeInterface, "NTP"));