From 18f97faa411078b95d042d207f5fff32bc8ece1d Mon Sep 17 00:00:00 2001 From: P Dheeraj Srujan Kumar Date: Thu, 31 Mar 2022 02:50:48 +0530 Subject: Update to internal 1-0.91 Signed-off-by: P Dheeraj Srujan Kumar --- ...ver-Check-return-code-for-sd_bus_add_objec.patch | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus/0001-Revert-server-Check-return-code-for-sd_bus_add_objec.patch') diff --git a/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus/0001-Revert-server-Check-return-code-for-sd_bus_add_objec.patch b/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus/0001-Revert-server-Check-return-code-for-sd_bus_add_objec.patch index 9aaf2f952..884e818a9 100644 --- a/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus/0001-Revert-server-Check-return-code-for-sd_bus_add_objec.patch +++ b/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus/0001-Revert-server-Check-return-code-for-sd_bus_add_objec.patch @@ -1,4 +1,4 @@ -From baff58f6e8f7aef4fd56be959fdd2e5e3c429eef Mon Sep 17 00:00:00 2001 +From 9d70ffc5532e17752903407d0267a281cc4be6d5 Mon Sep 17 00:00:00 2001 From: Johnathan Mantey Date: Mon, 13 Jul 2020 11:51:54 -0700 Subject: [PATCH] Revert "server: Check return code for @@ -6,29 +6,28 @@ Subject: [PATCH] Revert "server: Check return code for This reverts commit 017a19da5f67a74daedf4d63111569902d4764e6. --- - src/server/interface.cpp | 9 ++------- - 1 file changed, 2 insertions(+), 7 deletions(-) + src/server/interface.cpp | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/server/interface.cpp b/src/server/interface.cpp -index a72c656..0155b6d 100644 +index e47f6ef..1ea9a06 100644 --- a/src/server/interface.cpp +++ b/src/server/interface.cpp -@@ -17,13 +17,8 @@ interface::interface(sdbusplus::bus::bus& bus, const char* path, +@@ -17,12 +17,8 @@ interface::interface(sdbusplus::bus_t& bus, const char* path, _interface_added(false) { sd_bus_slot* slot = nullptr; -- int r = _intf->sd_bus_add_object_vtable(_bus.get(), &slot, _path.c_str(), -- _interf.c_str(), vtable, context); +- int r = _intf->sd_bus_add_object_vtable( +- get_busp(_bus), &slot, _path.c_str(), _interf.c_str(), vtable, context); - if (r < 0) - { - throw exception::SdBusError(-r, "sd_bus_add_object_vtable"); - } -- -+ _intf->sd_bus_add_object_vtable(_bus.get(), &slot, _path.c_str(), ++ _intf->sd_bus_add_object_vtable(get_busp(_bus), &slot, _path.c_str(), + _interf.c_str(), vtable, context); - _slot = decltype(_slot){slot}; - } + _slot = std::move(slot); + } -- 2.17.1 -- cgit v1.2.3