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: I4c07309c31740d17e90aa7831a6ac469643333ac
diff --git a/phosphor-power-supply/power_supply.cpp b/phosphor-power-supply/power_supply.cpp
index 0e2c259..ed1f9af 100644
--- a/phosphor-power-supply/power_supply.cpp
+++ b/phosphor-power-supply/power_supply.cpp
@@ -130,7 +130,7 @@
{
present = getPresence(bus, inventoryPath);
}
- catch (const sdbusplus::exception::SdBusError& e)
+ catch (const sdbusplus::exception::exception& e)
{
// Relying on property change or interface added to retry.
// Log an informational trace to the journal.
diff --git a/phosphor-regulators/src/presence_service.cpp b/phosphor-regulators/src/presence_service.cpp
index 9e15b03..61d8aec 100644
--- a/phosphor-regulators/src/presence_service.cpp
+++ b/phosphor-regulators/src/presence_service.cpp
@@ -41,7 +41,7 @@
util::getProperty(INVENTORY_IFACE, PRESENT_PROP, inventoryPath,
INVENTORY_MGR_IFACE, bus, present);
}
- catch (const sdbusplus::exception::SdBusError& e)
+ catch (const sdbusplus::exception::exception& e)
{
// If exception type is expected and indicates hardware not present
if (isExpectedException(e))
@@ -63,7 +63,7 @@
}
bool DBusPresenceService::isExpectedException(
- const sdbusplus::exception::SdBusError& e)
+ const sdbusplus::exception::exception& e)
{
// Initially assume exception is not one of the expected types
bool isExpected{false};
diff --git a/phosphor-regulators/src/presence_service.hpp b/phosphor-regulators/src/presence_service.hpp
index c81a671..79f839c 100644
--- a/phosphor-regulators/src/presence_service.hpp
+++ b/phosphor-regulators/src/presence_service.hpp
@@ -103,7 +103,7 @@
*
* @return true if exception type is expected, false otherwise
*/
- bool isExpectedException(const sdbusplus::exception::SdBusError& e);
+ bool isExpectedException(const sdbusplus::exception::exception& e);
/**
* D-Bus bus object.