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

Update usage of rmw_topic_endpoint_info_array (#101)

Browse source 
Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
This commit is contained in:
Ivan Santiago Paunovic 2020-02-20 14:11:35 -03:00 • committed by GitHub
parent 7d4e17224a
commit 49d4a51abf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rmw_cyclonedds_cpp/src/rmw_node.cpp
View file

@ -3108,7 +3108,6 @@ get_endpoint_info_by_topic(
err_msg.str); err_msg.str);
return ret; return ret;
} }
endpoint_info->count = 0;
node_cache_t node_cache; node_cache_t node_cache;
dds_entity_t ppant_rd; dds_entity_t ppant_rd;
@ -3120,25 +3119,23 @@ get_endpoint_info_by_topic(
handle_topic_endpoint_info_array_fini(endpoint_info, allocator); handle_topic_endpoint_info_array_fini(endpoint_info, allocator);
return RMW_RET_ERROR; return RMW_RET_ERROR;
} }
size_t i = 0;
for (const auto & epi : endpoint_info_vector) { for (const auto & epi : endpoint_info_vector) {
endpoint_info->info_array[endpoint_info->count] =
rmw_get_zero_initialized_topic_endpoint_info();
if ((ret = set_rmw_topic_endpoint_info( if ((ret = set_rmw_topic_endpoint_info(
node_cache, node_cache,
ppant_rd, ppant_rd,
allocator, allocator,
epi, epi,
is_publisher, is_publisher,
endpoint_info->info_array[endpoint_info->count])) != RMW_RET_OK) endpoint_info->info_array[i])) != RMW_RET_OK)
{ {
endpoint_info->count++;
handle_topic_endpoint_info_array_fini(endpoint_info, allocator); handle_topic_endpoint_info_array_fini(endpoint_info, allocator);
dds_delete(ppant_rd); dds_delete(ppant_rd);
return ret; return ret;
} }
endpoint_info->count++; i++;
} }
assert(endpoint_info->count == epi_count); assert(i == epi_count);
dds_delete(ppant_rd); dds_delete(ppant_rd);
return RMW_RET_OK; return RMW_RET_OK;
} }