commit 295b96b743cded8cdba7b0cda59dc1cfe84f64f0
author Patrick Williams <patrick@stwcx.xyz> Thu Sep 02 09:50:14 2021 -0500
committer Patrick Williams <patrick@stwcx.xyz> Thu Sep 02 09:50:14 2021 -0500
tree 8175c6fa7083c8a93d9e91c2ed9196637baa7c12
parent 9c02e7ec0afff8e9a1cd7ecff6060c85f0ad70b7

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

epoch_base.cpp

diff --git a/epoch_base.cpp b/epoch_base.cpp
index 96552ac..8f51f41 100644
--- a/epoch_base.cpp
+++ b/epoch_base.cpp
@@ -46,7 +46,7 @@
     {
         bus.call_noreply(method);
     }
-    catch (const sdbusplus::exception::SdBusError& ex)
+    catch (const sdbusplus::exception::exception& ex)
     {
         log<level::ERR>("Error in setting system time");
         using namespace xyz::openbmc_project::Time;

manager.cpp

diff --git a/manager.cpp b/manager.cpp
index 4cc0b57..383d416 100644
--- a/manager.cpp
+++ b/manager.cpp
@@ -86,7 +86,7 @@
         bus.call_noreply(method);
         log<level::INFO>("Updated NTP setting", entry("ENABLED=%d", isNtp));
     }
-    catch (const sdbusplus::exception::SdBusError& ex)
+    catch (const sdbusplus::exception::exception& ex)
     {
         log<level::ERR>("Failed to update NTP setting",
                         entry("ERR=%s", ex.what()));

utils.cpp

diff --git a/utils.cpp b/utils.cpp
index 3ea05a7..c9a8fbc 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -44,7 +44,7 @@
         }
         return mapperResponse[0].first;
     }
-    catch (const sdbusplus::exception::SdBusError& ex)
+    catch (const sdbusplus::exception::exception& ex)
     {
         log<level::ERR>("Mapper call failed", entry("METHOD=%d", "GetObject"),
                         entry("PATH=%s", path),

utils.hpp

diff --git a/utils.hpp b/utils.hpp
index 150e711..af83d38 100644
--- a/utils.hpp
+++ b/utils.hpp
@@ -38,7 +38,7 @@
         reply.read(value);
         return std::get<T>(value);
     }
-    catch (const sdbusplus::exception::SdBusError& ex)
+    catch (const sdbusplus::exception::exception& ex)
     {
         log<level::ERR>("GetProperty call failed", entry("PATH=%s", path),
                         entry("INTERFACE=%s", interface),