commit 2246cca047e65613c4ad76848cfb34f78330bfcc
author Patrick Williams <patrick@stwcx.xyz> Thu Sep 02 09:32:52 2021 -0500
committer Patrick Williams <patrick@stwcx.xyz> Thu Sep 02 09:32:52 2021 -0500
tree 22086f925ca7bc42d94e5b4c16f33aadc1056dec
parent 7bea73b399a93de69d2b6436a9428d3587a406f0

exception: switch to public sdbus exception

SdBusError was intended to be a private error type inside sdbusplus.
Switch all catch locations to use the general sdbusplus::exception type.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I013d8a225f7a15601a5defa487d7030daad77270

extensions/phal/create_pel.cpp

diff --git a/extensions/phal/create_pel.cpp b/extensions/phal/create_pel.cpp
index 6c53228..379e87e 100644
--- a/extensions/phal/create_pel.cpp
+++ b/extensions/phal/create_pel.cpp
@@ -70,7 +70,7 @@
         method.append(bootErrorMessage, level, additionalData, pelCalloutInfo);
         auto resp = bus.call(method);
     }
-    catch (const sdbusplus::exception::SdBusError& e)
+    catch (const sdbusplus::exception::exception& e)
     {
         log<level::ERR>("D-Bus call exception",
                         entry("OBJPATH=%s", loggingObjectPath),
@@ -105,7 +105,7 @@
         method.append(event, level, additionalData);
         auto resp = bus.call(method);
     }
-    catch (const sdbusplus::exception::SdBusError& e)
+    catch (const sdbusplus::exception::exception& e)
     {
         log<level::ERR>(fmt::format("sdbusplus D-Bus call exception",
                                     "OBJPATH={}, INTERFACE={}, EXCEPTION={}",

extensions/phal/fw_update_watch.cpp

diff --git a/extensions/phal/fw_update_watch.cpp b/extensions/phal/fw_update_watch.cpp
index af9dd3f..edaa7a6 100644
--- a/extensions/phal/fw_update_watch.cpp
+++ b/extensions/phal/fw_update_watch.cpp
@@ -43,7 +43,7 @@
     {
         msg.read(objectPath, interfaceMap);
     }
-    catch (const sdbusplus::exception::SdBusError& e)
+    catch (const sdbusplus::exception::exception& e)
     {
         log<level::ERR>(fmt::format("Failed to parse software add signal"
                                     "Exception [{}] REPLY_SIG [{}]",

procedures/phal/start_host.cpp

diff --git a/procedures/phal/start_host.cpp b/procedures/phal/start_host.cpp
index 6e3f683..9b853d7 100644
--- a/procedures/phal/start_host.cpp
+++ b/procedures/phal/start_host.cpp
@@ -116,7 +116,7 @@
         auto result = bus.call(properties);
         result.read(val);
     }
-    catch (const sdbusplus::exception::SdBusError& e)
+    catch (const sdbusplus::exception::exception& e)
     {
         log<level::ERR>("Get HW Keyword read from VINI Failed");
         throw std::runtime_error("Get HW Keyword read from VINI Failed");

util.cpp

diff --git a/util.cpp b/util.cpp
index 646529a..0c3e669 100644
--- a/util.cpp
+++ b/util.cpp
@@ -27,7 +27,7 @@
         auto reply = bus.call(method);
         reply.read(response);
     }
-    catch (const sdbusplus::exception::SdBusError& e)
+    catch (const sdbusplus::exception::exception& e)
     {
         log<level::ERR>(fmt::format("D-Bus call exception OBJPATH={}"
                                     "INTERFACE={}  EXCEPTION={}",