Skip to content

Commit

Permalink
iox-eclipse-iceoryx#1969 Use 'error' instead of 'get_error'
Browse files Browse the repository at this point in the history
  • Loading branch information
@elBoberido
elBoberido committed May 5, 2023
1 parent 54478a0 commit 19e8e77
Show file tree
Hide file tree
Showing 94 changed files with 299 additions and 308 deletions.
2 changes: 1 addition & 1 deletion doc/website/concepts/how-optional-and-error-values-are-returned-in-iceoryx.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ if (!result.has_error())
}
else
{
auto error = result.get_error();
auto error = result.error();
// handle the error
}
```
Expand Down
6 changes: 3 additions & 3 deletions iceoryx_binding_c/source/c_client.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ iox_AllocationResult iox_client_loan_aligned_request(iox_client_t const self,
auto result = self->loan(payloadSize, payloadAlignment);
if (result.has_error())
{
return cpp2c::allocationResult(result.get_error());
return cpp2c::allocationResult(result.error());
}

*payload = result.value();
Expand All @@ -131,7 +131,7 @@ iox_ClientSendResult iox_client_send(iox_client_t const self, void* const payloa
auto result = self->send(payload);
if (result.has_error())
{
return cpp2c::clientSendResult(result.get_error());
return cpp2c::clientSendResult(result.error());
}

return ClientSendResult_SUCCESS;
Expand Down Expand Up @@ -163,7 +163,7 @@ iox_ChunkReceiveResult iox_client_take_response(iox_client_t const self, const v
auto result = self->take();
if (result.has_error())
{
return cpp2c::chunkReceiveResult(result.get_error());
return cpp2c::chunkReceiveResult(result.error());
}

*payload = result.value();
Expand Down
26 changes: 10 additions & 16 deletions iceoryx_binding_c/source/c_listener.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ ENUM iox_ListenerResult iox_listener_attach_subscriber_event(iox_listener_t cons
NotificationCallback<cpp2c_Subscriber, popo::internal::NoType_t>{callback, nullptr});
if (result.has_error())
{
return cpp2c::listenerResult(result.get_error());
return cpp2c::listenerResult(result.error());
}
return ListenerResult_SUCCESS;
}
Expand All @@ -85,7 +85,7 @@ iox_listener_attach_subscriber_event_with_context_data(iox_listener_t const self
NotificationCallback<cpp2c_Subscriber, void>{callback, contextData});
if (result.has_error())
{
return cpp2c::listenerResult(result.get_error());
return cpp2c::listenerResult(result.error());
}
return ListenerResult_SUCCESS;
}
Expand All @@ -102,7 +102,7 @@ ENUM iox_ListenerResult iox_listener_attach_user_trigger_event(iox_listener_t co
self->attachEvent(*userTrigger, NotificationCallback<UserTrigger, popo::internal::NoType_t>{callback, nullptr});
if (result.has_error())
{
return cpp2c::listenerResult(result.get_error());
return cpp2c::listenerResult(result.error());
}
return ListenerResult_SUCCESS;
}
Expand All @@ -125,7 +125,7 @@ ENUM iox_ListenerResult iox_listener_attach_user_trigger_event_with_context_data
auto result = self->attachEvent(*userTrigger, NotificationCallback<UserTrigger, void>{callback, contextData});
if (result.has_error())
{
return cpp2c::listenerResult(result.get_error());
return cpp2c::listenerResult(result.error());
}
return ListenerResult_SUCCESS;
}
Expand Down Expand Up @@ -175,8 +175,7 @@ iox_ListenerResult iox_listener_attach_client_event(iox_listener_t const self,
*client,
c2cpp::clientEvent(clientEvent),
NotificationCallback<std::remove_pointer_t<iox_client_t>, popo::internal::NoType_t>{callback, nullptr});
return (result.has_error()) ? cpp2c::listenerResult(result.get_error())
: iox_ListenerResult::ListenerResult_SUCCESS;
return (result.has_error()) ? cpp2c::listenerResult(result.error()) : iox_ListenerResult::ListenerResult_SUCCESS;
}

iox_ListenerResult iox_listener_attach_client_event_with_context_data(iox_listener_t const self,
Expand All @@ -194,8 +193,7 @@ iox_ListenerResult iox_listener_attach_client_event_with_context_data(iox_listen
self->attachEvent(*client,
c2cpp::clientEvent(clientEvent),
NotificationCallback<std::remove_pointer_t<iox_client_t>, void>{callback, contextData});
return (result.has_error()) ? cpp2c::listenerResult(result.get_error())
: iox_ListenerResult::ListenerResult_SUCCESS;
return (result.has_error()) ? cpp2c::listenerResult(result.error()) : iox_ListenerResult::ListenerResult_SUCCESS;
}

void iox_listener_detach_client_event(iox_listener_t const self,
Expand All @@ -222,8 +220,7 @@ iox_ListenerResult iox_listener_attach_server_event(iox_listener_t const self,
*server,
c2cpp::serverEvent(serverEvent),
NotificationCallback<std::remove_pointer_t<iox_server_t>, popo::internal::NoType_t>{callback, nullptr});
return (result.has_error()) ? cpp2c::listenerResult(result.get_error())
: iox_ListenerResult::ListenerResult_SUCCESS;
return (result.has_error()) ? cpp2c::listenerResult(result.error()) : iox_ListenerResult::ListenerResult_SUCCESS;
}

iox_ListenerResult iox_listener_attach_server_event_with_context_data(iox_listener_t const self,
Expand All @@ -241,8 +238,7 @@ iox_ListenerResult iox_listener_attach_server_event_with_context_data(iox_listen
self->attachEvent(*server,
c2cpp::serverEvent(serverEvent),
NotificationCallback<std::remove_pointer_t<iox_server_t>, void>{callback, contextData});
return (result.has_error()) ? cpp2c::listenerResult(result.get_error())
: iox_ListenerResult::ListenerResult_SUCCESS;
return (result.has_error()) ? cpp2c::listenerResult(result.error()) : iox_ListenerResult::ListenerResult_SUCCESS;
}

void iox_listener_detach_server_event(iox_listener_t const self,
Expand Down Expand Up @@ -270,8 +266,7 @@ iox_listener_attach_service_discovery_event(iox_listener_t const self,
c2cpp::serviceDiscoveryEvent(serviceDiscoveryEvent),
NotificationCallback<ServiceDiscovery, popo::internal::NoType_t>{callback, nullptr});

return (result.has_error()) ? cpp2c::listenerResult(result.get_error())
: iox_ListenerResult::ListenerResult_SUCCESS;
return (result.has_error()) ? cpp2c::listenerResult(result.error()) : iox_ListenerResult::ListenerResult_SUCCESS;
}

iox_ListenerResult iox_listener_attach_service_discovery_event_with_context_data(
Expand All @@ -289,8 +284,7 @@ iox_ListenerResult iox_listener_attach_service_discovery_event_with_context_data
c2cpp::serviceDiscoveryEvent(serviceDiscoveryEvent),
NotificationCallback<ServiceDiscovery, void>{callback, contextData});

return (result.has_error()) ? cpp2c::listenerResult(result.get_error())
: iox_ListenerResult::ListenerResult_SUCCESS;
return (result.has_error()) ? cpp2c::listenerResult(result.error()) : iox_ListenerResult::ListenerResult_SUCCESS;
}

void iox_listener_detach_service_discovery_event(iox_listener_t const self,
Expand Down
2 changes: 1 addition & 1 deletion iceoryx_binding_c/source/c_publisher.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ iox_AllocationResult iox_pub_loan_aligned_chunk_with_user_header(iox_pub_t const
.and_then([&userPayload](ChunkHeader* h) { *userPayload = h->userPayload(); });
if (result.has_error())
{
return cpp2c::allocationResult(result.get_error());
return cpp2c::allocationResult(result.error());
}

return AllocationResult_SUCCESS;
Expand Down
6 changes: 3 additions & 3 deletions iceoryx_binding_c/source/c_server.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ iox_ServerRequestResult iox_server_take_request(iox_server_t const self, const v
auto result = self->take();
if (result.has_error())
{
return cpp2c::serverRequestResult(result.get_error());
return cpp2c::serverRequestResult(result.error());
}
*payload = result.value();
return ServerRequestResult_SUCCESS;
Expand Down Expand Up @@ -135,7 +135,7 @@ iox_AllocationResult iox_server_loan_aligned_response(iox_server_t const self,
auto result = self->loan(RequestHeader::fromPayload(requestPayload), payloadSize, payloadAlignment);
if (result.has_error())
{
return cpp2c::allocationResult(result.get_error());
return cpp2c::allocationResult(result.error());
}

*payload = result.value();
Expand All @@ -149,7 +149,7 @@ iox_ServerSendResult iox_server_send(iox_server_t const self, void* const payloa
auto result = self->send(payload);
if (result.has_error())
{
return cpp2c::serverSendResult(result.get_error());
return cpp2c::serverSendResult(result.error());
}

return ServerSendResult_SUCCESS;
Expand Down
2 changes: 1 addition & 1 deletion iceoryx_binding_c/source/c_subscriber.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ iox_ChunkReceiveResult iox_sub_take_chunk(iox_sub_t const self, const void** con
auto result = SubscriberPortUser(self->m_portData).tryGetChunk();
if (result.has_error())
{
return cpp2c::chunkReceiveResult(result.get_error());
return cpp2c::chunkReceiveResult(result.error());
}

*userPayload = result.value()->userPayload();
Expand Down
32 changes: 16 additions & 16 deletions iceoryx_binding_c/source/c_wait_set.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ iox_WaitSetResult iox_ws_attach_subscriber_state(iox_ws_t const self,
iox::cxx::Expects(subscriber != nullptr);

auto result = self->attachState(*subscriber, c2cpp::subscriberState(subscriberState), eventId, {callback, nullptr});
return (result.has_error()) ? cpp2c::waitSetResult(result.get_error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
return (result.has_error()) ? cpp2c::waitSetResult(result.error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
}

iox_WaitSetResult iox_ws_attach_subscriber_state_with_context_data(iox_ws_t const self,
Expand All @@ -151,7 +151,7 @@ iox_WaitSetResult iox_ws_attach_subscriber_state_with_context_data(iox_ws_t cons

auto result =
self->attachState(*subscriber, c2cpp::subscriberState(subscriberState), eventId, notificationCallback);
return (result.has_error()) ? cpp2c::waitSetResult(result.get_error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
return (result.has_error()) ? cpp2c::waitSetResult(result.error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
}

iox_WaitSetResult iox_ws_attach_subscriber_event(iox_ws_t const self,
Expand All @@ -164,7 +164,7 @@ iox_WaitSetResult iox_ws_attach_subscriber_event(iox_ws_t const self,
iox::cxx::Expects(subscriber != nullptr);

auto result = self->attachEvent(*subscriber, c2cpp::subscriberEvent(subscriberEvent), eventId, {callback, nullptr});
return (result.has_error()) ? cpp2c::waitSetResult(result.get_error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
return (result.has_error()) ? cpp2c::waitSetResult(result.error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
}

iox_WaitSetResult iox_ws_attach_subscriber_event_with_context_data(iox_ws_t const self,
Expand All @@ -183,7 +183,7 @@ iox_WaitSetResult iox_ws_attach_subscriber_event_with_context_data(iox_ws_t cons

auto result =
self->attachEvent(*subscriber, c2cpp::subscriberEvent(subscriberEvent), eventId, notificationCallback);
return (result.has_error()) ? cpp2c::waitSetResult(result.get_error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
return (result.has_error()) ? cpp2c::waitSetResult(result.error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
}

iox_WaitSetResult iox_ws_attach_user_trigger_event(iox_ws_t const self,
Expand All @@ -195,7 +195,7 @@ iox_WaitSetResult iox_ws_attach_user_trigger_event(iox_ws_t const self,
iox::cxx::Expects(userTrigger != nullptr);

auto result = self->attachEvent(*userTrigger, eventId, {callback, nullptr});
return (result.has_error()) ? cpp2c::waitSetResult(result.get_error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
return (result.has_error()) ? cpp2c::waitSetResult(result.error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
}

iox_WaitSetResult iox_ws_attach_user_trigger_event_with_context_data(iox_ws_t const self,
Expand All @@ -212,7 +212,7 @@ iox_WaitSetResult iox_ws_attach_user_trigger_event_with_context_data(iox_ws_t co
notificationCallback.m_contextData = contextData;

auto result = self->attachEvent(*userTrigger, eventId, notificationCallback);
return (result.has_error()) ? cpp2c::waitSetResult(result.get_error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
return (result.has_error()) ? cpp2c::waitSetResult(result.error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
}

void iox_ws_detach_subscriber_event(iox_ws_t const self,
Expand Down Expand Up @@ -253,7 +253,7 @@ iox_WaitSetResult iox_ws_attach_client_event(const iox_ws_t self,
iox::cxx::Expects(client != nullptr);

auto result = self->attachEvent(*client, c2cpp::clientEvent(clientEvent), eventId, {callback, nullptr});
return (result.has_error()) ? cpp2c::waitSetResult(result.get_error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
return (result.has_error()) ? cpp2c::waitSetResult(result.error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
}

iox_WaitSetResult iox_ws_attach_client_event_with_context_data(iox_ws_t const self,
Expand All @@ -271,7 +271,7 @@ iox_WaitSetResult iox_ws_attach_client_event_with_context_data(iox_ws_t const se
notificationCallback.m_contextData = contextData;

auto result = self->attachEvent(*client, c2cpp::clientEvent(clientEvent), eventId, notificationCallback);
return (result.has_error()) ? cpp2c::waitSetResult(result.get_error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
return (result.has_error()) ? cpp2c::waitSetResult(result.error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
}

iox_WaitSetResult iox_ws_attach_client_state(const iox_ws_t self,
Expand All @@ -284,7 +284,7 @@ iox_WaitSetResult iox_ws_attach_client_state(const iox_ws_t self,
iox::cxx::Expects(client != nullptr);

auto result = self->attachState(*client, c2cpp::clientState(clientState), eventId, {callback, nullptr});
return (result.has_error()) ? cpp2c::waitSetResult(result.get_error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
return (result.has_error()) ? cpp2c::waitSetResult(result.error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
}

iox_WaitSetResult iox_ws_attach_client_state_with_context_data(iox_ws_t const self,
Expand All @@ -302,7 +302,7 @@ iox_WaitSetResult iox_ws_attach_client_state_with_context_data(iox_ws_t const se
notificationCallback.m_contextData = contextData;

auto result = self->attachState(*client, c2cpp::clientState(clientState), eventId, notificationCallback);
return (result.has_error()) ? cpp2c::waitSetResult(result.get_error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
return (result.has_error()) ? cpp2c::waitSetResult(result.error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
}

void iox_ws_detach_client_event(iox_ws_t const self, iox_client_t const client, const ENUM iox_ClientEvent clientEvent)
Expand Down Expand Up @@ -331,7 +331,7 @@ iox_WaitSetResult iox_ws_attach_server_event(const iox_ws_t self,
iox::cxx::Expects(server != nullptr);

auto result = self->attachEvent(*server, c2cpp::serverEvent(serverEvent), eventId, {callback, nullptr});
return (result.has_error()) ? cpp2c::waitSetResult(result.get_error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
return (result.has_error()) ? cpp2c::waitSetResult(result.error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
}

iox_WaitSetResult iox_ws_attach_server_event_with_context_data(iox_ws_t const self,
Expand All @@ -349,7 +349,7 @@ iox_WaitSetResult iox_ws_attach_server_event_with_context_data(iox_ws_t const se
notificationCallback.m_contextData = contextData;

auto result = self->attachEvent(*server, c2cpp::serverEvent(serverEvent), eventId, notificationCallback);
return (result.has_error()) ? cpp2c::waitSetResult(result.get_error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
return (result.has_error()) ? cpp2c::waitSetResult(result.error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
}

iox_WaitSetResult iox_ws_attach_server_state(const iox_ws_t self,
Expand All @@ -362,7 +362,7 @@ iox_WaitSetResult iox_ws_attach_server_state(const iox_ws_t self,
iox::cxx::Expects(server != nullptr);

auto result = self->attachState(*server, c2cpp::serverState(serverState), eventId, {callback, nullptr});
return (result.has_error()) ? cpp2c::waitSetResult(result.get_error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
return (result.has_error()) ? cpp2c::waitSetResult(result.error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
}

iox_WaitSetResult iox_ws_attach_server_state_with_context_data(iox_ws_t const self,
Expand All @@ -380,7 +380,7 @@ iox_WaitSetResult iox_ws_attach_server_state_with_context_data(iox_ws_t const se
notificationCallback.m_contextData = contextData;

auto result = self->attachState(*server, c2cpp::serverState(serverState), eventId, notificationCallback);
return (result.has_error()) ? cpp2c::waitSetResult(result.get_error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
return (result.has_error()) ? cpp2c::waitSetResult(result.error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
}

void iox_ws_detach_server_event(iox_ws_t const self, iox_server_t const server, const ENUM iox_ServerEvent serverEvent)
Expand Down Expand Up @@ -410,7 +410,7 @@ iox_WaitSetResult iox_ws_attach_service_discovery_event(const iox_ws_t self,

auto result = self->attachEvent(
*serviceDiscovery, c2cpp::serviceDiscoveryEvent(serviceDiscoveryEvent), eventId, {callback, nullptr});
return (result.has_error()) ? cpp2c::waitSetResult(result.get_error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
return (result.has_error()) ? cpp2c::waitSetResult(result.error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
}

iox_WaitSetResult
Expand All @@ -430,7 +430,7 @@ iox_ws_attach_service_discovery_event_with_context_data(iox_ws_t const self,

auto result = self->attachEvent(
*serviceDiscovery, c2cpp::serviceDiscoveryEvent(serviceDiscoveryEvent), eventId, notificationCallback);
return (result.has_error()) ? cpp2c::waitSetResult(result.get_error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
return (result.has_error()) ? cpp2c::waitSetResult(result.error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
}

void iox_ws_detach_service_discovery_event(iox_ws_t const self,
Expand Down
2 changes: 1 addition & 1 deletion iceoryx_dust/include/iceoryx_dust/design/creation.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ namespace DesignPattern
///
/// // if the system resource is movable
/// auto resource = MyResourceAbstraction::Create(123);
/// if ( resource.has_error() && resource.get_error() == MyResourceAbstractionError::ResourceNotAvailable )
/// if ( resource.has_error() && resource.error() == MyResourceAbstractionError::ResourceNotAvailable )
/// // perform error handling
/// else
/// // perform some work
Expand Down
Loading

0 comments on commit 19e8e77

Please sign in to comment.