feedc0de/sdbus-cpp
1
0
Fork 0
forked from Kistler-Group/sdbus-cpp
Code Pull Requests Activity

refactor: use optional for passing potential call errors (#396)

Browse Source 
This switches from a raw pointer to std::optional type to pass prospective call errors to the client (using std::optional was not possible years back when sdbus-c++ was based on C++14). This makes the API a little clearer, safer, idiomatically more expressive, and removes potential confusion associated with raw pointers (like ownership, lifetime questions, etc.).
This commit is contained in:
Stanislav Angelovič
2024-01-10 15:43:37 +01:00
parent 914d133d10
commit 3de2812a60
12 changed files with 101 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Proxy.cpp
View File

@@ -121,12 +121,12 @@ std::future<MethodReply> Proxy::callMethodAsync(const MethodCall& message, uint6
auto promise = std::make_shared<std::promise<MethodReply>>();
auto future = promise->get_future();
async_reply_handler asyncReplyCallback = [promise = std::move(promise)](MethodReply reply, const Error* error) noexcept
async_reply_handler asyncReplyCallback = [promise = std::move(promise)](MethodReply reply, std::optional<Error> error) noexcept
{
if (error == nullptr)
if (!error)
promise->set_value(std::move(reply));
else
promise->set_exception(std::make_exception_ptr(*error));
promise->set_exception(std::make_exception_ptr(*std::move(error)));
};
(void)Proxy::callMethodAsync(message, std::move(asyncReplyCallback), timeout);
@@ -207,12 +207,12 @@ int Proxy::sdbus_async_reply_handler(sd_bus_message *sdbusMessage, void *userDat
const auto* error = sd_bus_message_get_error(sdbusMessage);
if (error == nullptr)
{
asyncCallData->callback(std::move(message), nullptr);
asyncCallData->callback(std::move(message), {});
}
else
{
Error exception(error->name, error->message);
asyncCallData->callback(std::move(message), &exception);
asyncCallData->callback(std::move(message), std::move(exception));
}
}, retError);