From 99160156fe3c1355cb20251263b066c2f9cf910f Mon Sep 17 00:00:00 2001 From: sangelovic Date: Fri, 12 Apr 2019 22:39:14 +0200 Subject: [PATCH] Fix all gcc warnings --- src/Proxy.cpp | 4 +++- test/integrationtests/proxy-glue.h | 20 +++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/Proxy.cpp b/src/Proxy.cpp index 0fc2d8f..fe9c344 100644 --- a/src/Proxy.cpp +++ b/src/Proxy.cpp @@ -122,7 +122,7 @@ void Proxy::registerSignalHandlers(sdbus::internal::IConnection& connection) } } -int Proxy::sdbus_async_reply_handler(sd_bus_message *sdbusMessage, void *userData, sd_bus_error *retError) +int Proxy::sdbus_async_reply_handler(sd_bus_message *sdbusMessage, void *userData, sd_bus_error */*retError*/) { // We are assuming the ownership of the async reply handler pointer passed here std::unique_ptr asyncReplyUserData{static_cast(userData)}; @@ -141,6 +141,8 @@ int Proxy::sdbus_async_reply_handler(sd_bus_message *sdbusMessage, void *userDat sdbus::Error exception(error->name, error->message); asyncReplyUserData->callback(message, &exception); } + + return 1; } int Proxy::sdbus_signal_callback(sd_bus_message *sdbusMessage, void *userData, sd_bus_error */*retError*/) diff --git a/test/integrationtests/proxy-glue.h b/test/integrationtests/proxy-glue.h index 1d8d5a7..c393608 100644 --- a/test/integrationtests/proxy-glue.h +++ b/test/integrationtests/proxy-glue.h @@ -140,23 +140,25 @@ public: return result; } - uint32_t doOperationClientSideAsync(uint32_t param) + void doOperationClientSideAsync(uint32_t param) { object_.callMethodAsync("doOperation") .onInterface(INTERFACE_NAME) .withArguments(param) .uponReplyInvoke([this](const sdbus::Error* error, uint32_t returnValue) - { - this->onDoOperationReply(returnValue, error); - }); + { + this->onDoOperationReply(returnValue, error); + }); } - uint32_t doErroneousOperationClientSideAsync() + void doErroneousOperationClientSideAsync() { - object_.callMethodAsync("throwError").onInterface(INTERFACE_NAME).uponReplyInvoke([this](const sdbus::Error* error) - { - this->onDoOperationReply(0, error); - }); + object_.callMethodAsync("throwError") + .onInterface(INTERFACE_NAME) + .uponReplyInvoke([this](const sdbus::Error* error) + { + this->onDoOperationReply(0, error); + }); } sdbus::Signature getSignature()