niklas/rmw_cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update gid API return codes. (#244)

Browse source 
Signed-off-by: Michel Hidalgo <michel@ekumenlabs.com>
This commit is contained in:
Michel Hidalgo 2020-09-22 18:20:27 -03:00 • committed by Alejandro Hernández Cordero
parent 914037bd29
commit 6bc75b4a49
1 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

29
rmw_cyclonedds_cpp/src/rmw_node.cpp
View file

@ -2033,11 +2033,14 @@ extern "C" rmw_publisher_t * rmw_create_publisher(
extern "C" rmw_ret_t rmw_get_gid_for_publisher(const rmw_publisher_t * publisher, rmw_gid_t * gid) extern "C" rmw_ret_t rmw_get_gid_for_publisher(const rmw_publisher_t * publisher, rmw_gid_t * gid)
{ {
RET_NULL(publisher); RMW_CHECK_ARGUMENT_FOR_NULL(publisher, RMW_RET_INVALID_ARGUMENT);
RET_WRONG_IMPLID(publisher); RMW_CHECK_TYPE_IDENTIFIERS_MATCH(
RET_NULL(gid); publisher,
publisher->implementation_identifier,
eclipse_cyclonedds_identifier,
return RMW_RET_INCORRECT_RMW_IMPLEMENTATION);
RMW_CHECK_ARGUMENT_FOR_NULL(gid, RMW_RET_INVALID_ARGUMENT);
auto pub = static_cast<const CddsPublisher *>(publisher->data); auto pub = static_cast<const CddsPublisher *>(publisher->data);
RET_NULL(pub);
gid->implementation_identifier = eclipse_cyclonedds_identifier; gid->implementation_identifier = eclipse_cyclonedds_identifier;
memset(gid->data, 0, sizeof(gid->data)); memset(gid->data, 0, sizeof(gid->data));
assert(sizeof(pub->pubiid) <= sizeof(gid->data)); assert(sizeof(pub->pubiid) <= sizeof(gid->data));
@ -2049,11 +2052,19 @@ extern "C" rmw_ret_t rmw_compare_gids_equal(
const rmw_gid_t * gid1, const rmw_gid_t * gid2, const rmw_gid_t * gid1, const rmw_gid_t * gid2,
bool * result) bool * result)
{ {
RET_NULL(gid1); RMW_CHECK_ARGUMENT_FOR_NULL(gid1, RMW_RET_INVALID_ARGUMENT);
RET_WRONG_IMPLID(gid1); RMW_CHECK_TYPE_IDENTIFIERS_MATCH(
RET_NULL(gid2); gid1,
RET_WRONG_IMPLID(gid2); gid1->implementation_identifier,
RET_NULL(result); eclipse_cyclonedds_identifier,
return RMW_RET_INCORRECT_RMW_IMPLEMENTATION);
RMW_CHECK_ARGUMENT_FOR_NULL(gid2, RMW_RET_INVALID_ARGUMENT);
RMW_CHECK_TYPE_IDENTIFIERS_MATCH(
gid2,
gid2->implementation_identifier,
eclipse_cyclonedds_identifier,
return RMW_RET_INCORRECT_RMW_IMPLEMENTATION);
RMW_CHECK_ARGUMENT_FOR_NULL(result, RMW_RET_INVALID_ARGUMENT);
/* alignment is potentially lost because of the translation to an array of bytes, so use /* alignment is potentially lost because of the translation to an array of bytes, so use
memcmp instead of a simple integer comparison */ memcmp instead of a simple integer comparison */
*result = memcmp(gid1->data, gid2->data, sizeof(gid1->data)) == 0; *result = memcmp(gid1->data, gid2->data, sizeof(gid1->data)) == 0;