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: If98df395e3717aa119e192457220e31ce3ea4fe7
diff --git a/src/method.hpp b/src/method.hpp
index 1399531..8a561b6 100644
--- a/src/method.hpp
+++ b/src/method.hpp
@@ -36,7 +36,7 @@
DBusInterface::callMethodNoReply(bus, path, iface, method,
std::forward<MethodArgs>(args)...);
}
- catch (const sdbusplus::exception::SdBusError& e)
+ catch (const sdbusplus::exception::exception& e)
{
// clang-format off
log<level::ERR>("Unable to call DBus method",
diff --git a/src/propertywatchimpl.hpp b/src/propertywatchimpl.hpp
index 60aff5c..ef50494 100644
--- a/src/propertywatchimpl.hpp
+++ b/src/propertywatchimpl.hpp
@@ -57,7 +57,7 @@
MAPPER_BUSNAME, MAPPER_PATH, MAPPER_INTERFACE, "GetObject",
path, queryInterfaces);
}
- catch (const sdbusplus::exception::SdBusError&)
+ catch (const sdbusplus::exception::exception&)
{
// Paths in the configuration may not exist yet. Prime those
// later, when/if InterfacesAdded occurs.
@@ -104,7 +104,7 @@
{
updateProperties(busName, path, interface);
}
- catch (const sdbusplus::exception::SdBusError&)
+ catch (const sdbusplus::exception::exception&)
{
// If for some reason the path has gone away since
// the mapper lookup we'll simply try again if/when
diff --git a/src/sdbusplus.hpp b/src/sdbusplus.hpp
index 02c530d..f7049ac 100644
--- a/src/sdbusplus.hpp
+++ b/src/sdbusplus.hpp
@@ -19,7 +19,6 @@
{
using namespace phosphor::logging;
-using sdbusplus::exception::SdBusError;
/** @class SDBusPlus
* @brief DBus access delegate implementation for sdbusplus.
@@ -83,7 +82,7 @@
{
respMsg.read(resp);
}
- catch (const SdBusError& e)
+ catch (const sdbusplus::exception::exception& e)
{
// Empty responses are expected sometimes, and the calling
// code is set up to handle it.
@@ -117,7 +116,7 @@
name = object.begin()->first;
}
}
- catch (const SdBusError& e)
+ catch (const sdbusplus::exception::exception& e)
{
// Empty responses are expected sometimes, and the calling
// code is set up to handle it.