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

Fix all gcc warnings

Browse Source
This commit is contained in:
sangelovic
2019-04-12 22:39:14 +02:00
parent ee30375cfc
commit 99160156fe
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Proxy.cpp
View File

@ -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 // We are assuming the ownership of the async reply handler pointer passed here
std::unique_ptr<AsyncReplyUserData> asyncReplyUserData{static_cast<AsyncReplyUserData*>(userData)}; std::unique_ptr<AsyncReplyUserData> asyncReplyUserData{static_cast<AsyncReplyUserData*>(userData)};
@ -141,6 +141,8 @@ int Proxy::sdbus_async_reply_handler(sd_bus_message *sdbusMessage, void *userDat
sdbus::Error exception(error->name, error->message); sdbus::Error exception(error->name, error->message);
asyncReplyUserData->callback(message, &exception); asyncReplyUserData->callback(message, &exception);
} }
return 1;
} }
int Proxy::sdbus_signal_callback(sd_bus_message *sdbusMessage, void *userData, sd_bus_error */*retError*/) int Proxy::sdbus_signal_callback(sd_bus_message *sdbusMessage, void *userData, sd_bus_error */*retError*/)

20
test/integrationtests/proxy-glue.h
View File

@ -140,23 +140,25 @@ public:
return result; return result;
} }
uint32_t doOperationClientSideAsync(uint32_t param) void doOperationClientSideAsync(uint32_t param)
{ {
object_.callMethodAsync("doOperation") object_.callMethodAsync("doOperation")
.onInterface(INTERFACE_NAME) .onInterface(INTERFACE_NAME)
.withArguments(param) .withArguments(param)
.uponReplyInvoke([this](const sdbus::Error* error, uint32_t returnValue) .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) object_.callMethodAsync("throwError")
{ .onInterface(INTERFACE_NAME)
this->onDoOperationReply(0, error); .uponReplyInvoke([this](const sdbus::Error* error)
}); {
this->onDoOperationReply(0, error);
});
} }
sdbus::Signature getSignature() sdbus::Signature getSignature()