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

Solve the lint issue.

Browse source 
Signed-off-by: evshary <evshary@gmail.com>
This commit is contained in:
evshary 2019-10-21 17:08:12 +08:00 • committed by eboasson
parent 7bfd709fe0
commit 6d907ef583
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
rmw_cyclonedds_cpp/src/rmw_node.cpp
View file

@ -63,12 +63,12 @@
/* True if the version of RMW is at least major.minor.patch */ /* True if the version of RMW is at least major.minor.patch */
#define RMW_VERSION_GTE(major, minor, patch) ( \ #define RMW_VERSION_GTE(major, minor, patch) ( \
major < RMW_VERSION_MAJOR ? true \ (major < RMW_VERSION_MAJOR) ? true \
: major > RMW_VERSION_MAJOR ? false \ : (major > RMW_VERSION_MAJOR) ? false \
: minor < RMW_VERSION_MINOR ? true \ : (minor < RMW_VERSION_MINOR) ? true \
: minor > RMW_VERSION_MINOR ? false \ : (minor > RMW_VERSION_MINOR) ? false \
: patch < RMW_VERSION_PATCH ? true \ : (patch < RMW_VERSION_PATCH) ? true \
: patch > RMW_VERSION_PATCH ? false \ : (patch > RMW_VERSION_PATCH) ? false \
: true) : true)
/* Set to > 0 for printing warnings to stderr for each messages that was taken more than this many /* Set to > 0 for printing warnings to stderr for each messages that was taken more than this many
@ -502,13 +502,13 @@ extern "C" rmw_node_t * rmw_create_node(
rmw_context_t * context, const char * name, rmw_context_t * context, const char * name,
const char * namespace_, size_t domain_id, const char * namespace_, size_t domain_id,
const rmw_node_security_options_t * security_options const rmw_node_security_options_t * security_options
#if RMW_VERSION_GTE(0,8,1) #if RMW_VERSION_GTE(0, 8, 1)
, bool localhost_only , bool localhost_only
#endif #endif
) )
{ {
static_cast<void>(context); static_cast<void>(context);
#if RMW_VERSION_GTE(0,8,1) #if RMW_VERSION_GTE(0, 8, 1)
static_cast<void>(localhost_only); static_cast<void>(localhost_only);
#endif #endif
RET_NULL_X(name, return nullptr); RET_NULL_X(name, return nullptr);
@ -1118,14 +1118,14 @@ extern "C" rmw_ret_t rmw_fini_publisher_allocation(rmw_publisher_allocation_t *
extern "C" rmw_publisher_t * rmw_create_publisher( extern "C" rmw_publisher_t * rmw_create_publisher(
const rmw_node_t * node, const rosidl_message_type_support_t * type_supports, const rmw_node_t * node, const rosidl_message_type_support_t * type_supports,
const char * topic_name, const rmw_qos_profile_t * qos_policies const char * topic_name, const rmw_qos_profile_t * qos_policies
#if RMW_VERSION_GTE(0,8,1) #if RMW_VERSION_GTE(0, 8, 1)
, const rmw_publisher_options_t * publisher_options , const rmw_publisher_options_t * publisher_options
#endif #endif
) )
{ {
CddsPublisher * pub; CddsPublisher * pub;
rmw_publisher_t * rmw_publisher; rmw_publisher_t * rmw_publisher;
#if RMW_VERSION_GTE(0,8,1) #if RMW_VERSION_GTE(0, 8, 1)
RET_NULL_X(publisher_options, return nullptr); RET_NULL_X(publisher_options, return nullptr);
#endif #endif
if ((pub = create_cdds_publisher(node, type_supports, topic_name, qos_policies)) == nullptr) { if ((pub = create_cdds_publisher(node, type_supports, topic_name, qos_policies)) == nullptr) {
@ -1138,7 +1138,7 @@ extern "C" rmw_publisher_t * rmw_create_publisher(
rmw_publisher->topic_name = reinterpret_cast<char *>(rmw_allocate(strlen(topic_name) + 1)); rmw_publisher->topic_name = reinterpret_cast<char *>(rmw_allocate(strlen(topic_name) + 1));
RET_ALLOC_X(rmw_publisher->topic_name, goto fail_topic_name); RET_ALLOC_X(rmw_publisher->topic_name, goto fail_topic_name);
memcpy(const_cast<char *>(rmw_publisher->topic_name), topic_name, strlen(topic_name) + 1); memcpy(const_cast<char *>(rmw_publisher->topic_name), topic_name, strlen(topic_name) + 1);
#if RMW_VERSION_GTE(0,8,1) #if RMW_VERSION_GTE(0, 8, 1)
rmw_publisher->options = *publisher_options; rmw_publisher->options = *publisher_options;
#endif #endif
return rmw_publisher; return rmw_publisher;
@ -1347,7 +1347,7 @@ extern "C" rmw_ret_t rmw_fini_subscription_allocation(rmw_subscription_allocatio
extern "C" rmw_subscription_t * rmw_create_subscription( extern "C" rmw_subscription_t * rmw_create_subscription(
const rmw_node_t * node, const rosidl_message_type_support_t * type_supports, const rmw_node_t * node, const rosidl_message_type_support_t * type_supports,
const char * topic_name, const rmw_qos_profile_t * qos_policies const char * topic_name, const rmw_qos_profile_t * qos_policies
#if RMW_VERSION_GTE(0,8,1) #if RMW_VERSION_GTE(0, 8, 1)
, const rmw_subscription_options_t * subscription_options , const rmw_subscription_options_t * subscription_options
#else #else
, bool ignore_local_publications , bool ignore_local_publications
@ -1356,13 +1356,13 @@ extern "C" rmw_subscription_t * rmw_create_subscription(
{ {
CddsSubscription * sub; CddsSubscription * sub;
rmw_subscription_t * rmw_subscription; rmw_subscription_t * rmw_subscription;
#if RMW_VERSION_GTE(0,8,1) #if RMW_VERSION_GTE(0, 8, 1)
RET_NULL_X(subscription_options, return nullptr); RET_NULL_X(subscription_options, return nullptr);
#endif #endif
if ( if (
(sub = create_cdds_subscription( (sub = create_cdds_subscription(
node, type_supports, topic_name, qos_policies, node, type_supports, topic_name, qos_policies,
#if RMW_VERSION_GTE(0,8,1) #if RMW_VERSION_GTE(0, 8, 1)
subscription_options->ignore_local_publications subscription_options->ignore_local_publications
#else #else
ignore_local_publications ignore_local_publications
@ -1379,7 +1379,7 @@ extern "C" rmw_subscription_t * rmw_create_subscription(
reinterpret_cast<const char *>(rmw_allocate(strlen(topic_name) + 1)); reinterpret_cast<const char *>(rmw_allocate(strlen(topic_name) + 1));
RET_ALLOC_X(rmw_subscription->topic_name, goto fail_topic_name); RET_ALLOC_X(rmw_subscription->topic_name, goto fail_topic_name);
memcpy(const_cast<char *>(rmw_subscription->topic_name), topic_name, strlen(topic_name) + 1); memcpy(const_cast<char *>(rmw_subscription->topic_name), topic_name, strlen(topic_name) + 1);
#if RMW_VERSION_GTE(0,8,1) #if RMW_VERSION_GTE(0, 8, 1)
rmw_subscription->options = *subscription_options; rmw_subscription->options = *subscription_options;
#endif #endif
return rmw_subscription; return rmw_subscription;