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

Replace __attribute__((unused)) with static_cast<void>

Browse source 
Signed-off-by: Hunter L. Allen <hunterlallen@protonmail.com>
This commit is contained in:
Hunter L. Allen 2019-06-17 20:41:13 -04:00 • committed by eboasson
parent 7acc5f3222
commit eb4aec84ca
2 changed files with 80 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

68
rmw_cyclonedds_cpp/src/rmw_node.cpp
View file

@ -149,7 +149,10 @@ static Cdds gcdds;
static void clean_waitset_caches (); static void clean_waitset_caches ();
#ifndef WIN32
/* TODO(allenh1): check for Clang */
#pragma GCC visibility push (default) #pragma GCC visibility push (default)
#endif
extern "C" const char *rmw_get_implementation_identifier () extern "C" const char *rmw_get_implementation_identifier ()
{ {
@ -161,8 +164,9 @@ extern "C" const char *rmw_get_serialization_format()
return eclipse_cyclonedds_serialization_format; return eclipse_cyclonedds_serialization_format;
} }
extern "C" rmw_ret_t rmw_set_log_severity (rmw_log_severity_t severity __attribute__ ((unused))) extern "C" rmw_ret_t rmw_set_log_severity (rmw_log_severity_t severity)
{ {
static_cast<void>(severity);
RMW_SET_ERROR_MSG ("unimplemented"); RMW_SET_ERROR_MSG ("unimplemented");
return RMW_RET_ERROR; return RMW_RET_ERROR;
} }
@ -226,8 +230,10 @@ extern "C" rmw_ret_t rmw_init_options_fini (rmw_init_options_t *init_options)
return RMW_RET_OK; return RMW_RET_OK;
} }
extern "C" rmw_ret_t rmw_init (const rmw_init_options_t *options __attribute__ ((unused)), rmw_context_t *context __attribute__ ((unused))) extern "C" rmw_ret_t rmw_init (const rmw_init_options_t *options, rmw_context_t *context)
{ {
static_cast<void>(options);
static_cast<void>(context);
RCUTILS_CHECK_ARGUMENT_FOR_NULL (options, RMW_RET_INVALID_ARGUMENT); RCUTILS_CHECK_ARGUMENT_FOR_NULL (options, RMW_RET_INVALID_ARGUMENT);
RCUTILS_CHECK_ARGUMENT_FOR_NULL (context, RMW_RET_INVALID_ARGUMENT); RCUTILS_CHECK_ARGUMENT_FOR_NULL (context, RMW_RET_INVALID_ARGUMENT);
RMW_CHECK_TYPE_IDENTIFIERS_MATCH ( RMW_CHECK_TYPE_IDENTIFIERS_MATCH (
@ -309,8 +315,9 @@ static std::string get_node_user_data (const char *node_name, const char *node_n
std::string (";")); std::string (";"));
} }
extern "C" rmw_node_t *rmw_create_node (rmw_context_t *context __attribute__ ((unused)), const char *name, const char *namespace_, size_t domain_id, const rmw_node_security_options_t *security_options) extern "C" rmw_node_t *rmw_create_node (rmw_context_t *context, const char *name, const char *namespace_, size_t domain_id, const rmw_node_security_options_t *security_options)
{ {
static_cast<void>(context);
RET_NULL_X (name, return nullptr); RET_NULL_X (name, return nullptr);
RET_NULL_X (namespace_, return nullptr); RET_NULL_X (namespace_, return nullptr);
(void) domain_id; (void) domain_id;
@ -436,8 +443,11 @@ extern "C" const rmw_guard_condition_t *rmw_node_get_graph_guard_condition (cons
using MessageTypeSupport_c = rmw_cyclonedds_cpp::MessageTypeSupport<rosidl_typesupport_introspection_c__MessageMembers>; using MessageTypeSupport_c = rmw_cyclonedds_cpp::MessageTypeSupport<rosidl_typesupport_introspection_c__MessageMembers>;
using MessageTypeSupport_cpp = rmw_cyclonedds_cpp::MessageTypeSupport<rosidl_typesupport_introspection_cpp::MessageMembers>; using MessageTypeSupport_cpp = rmw_cyclonedds_cpp::MessageTypeSupport<rosidl_typesupport_introspection_cpp::MessageMembers>;
extern "C" rmw_ret_t rmw_get_serialized_message_size (const rosidl_message_type_support_t *type_support __attribute__ ((unused)), const rosidl_message_bounds_t *message_bounds __attribute__ ((unused)), size_t *size __attribute__ ((unused))) extern "C" rmw_ret_t rmw_get_serialized_message_size (const rosidl_message_type_support_t *type_support, const rosidl_message_bounds_t *message_bounds, size_t *size)
{ {
static_cast<void>(type_support);
static_cast<void>(message_bounds);
static_cast<void>(size);
RMW_SET_ERROR_MSG ("rmw_get_serialized_message_size: unimplemented"); RMW_SET_ERROR_MSG ("rmw_get_serialized_message_size: unimplemented");
return RMW_RET_ERROR; return RMW_RET_ERROR;
} }
@ -495,8 +505,9 @@ extern "C" rmw_ret_t rmw_deserialize (const rmw_serialized_message_t *serialized
/////////// /////////// /////////// ///////////
///////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////
extern "C" rmw_ret_t rmw_publish (const rmw_publisher_t *publisher, const void *ros_message, rmw_publisher_allocation_t *allocation __attribute__ ((unused))) extern "C" rmw_ret_t rmw_publish (const rmw_publisher_t *publisher, const void *ros_message, rmw_publisher_allocation_t *allocation)
{ {
static_cast<void>(allocation); // unused
RET_WRONG_IMPLID (publisher); RET_WRONG_IMPLID (publisher);
RET_NULL (ros_message); RET_NULL (ros_message);
auto pub = static_cast<CddsPublisher *> (publisher->data); auto pub = static_cast<CddsPublisher *> (publisher->data);
@ -509,8 +520,9 @@ extern "C" rmw_ret_t rmw_publish (const rmw_publisher_t *publisher, const void *
} }
} }
extern "C" rmw_ret_t rmw_publish_serialized_message (const rmw_publisher_t *publisher, const rmw_serialized_message_t *serialized_message, rmw_publisher_allocation_t *allocation __attribute__ ((unused))) extern "C" rmw_ret_t rmw_publish_serialized_message (const rmw_publisher_t *publisher, const rmw_serialized_message_t *serialized_message, rmw_publisher_allocation_t *allocation)
{ {
static_cast<void>(allocation); // unused
RET_WRONG_IMPLID (publisher); RET_WRONG_IMPLID (publisher);
RET_NULL (serialized_message); RET_NULL (serialized_message);
auto pub = static_cast<CddsPublisher *> (publisher->data); auto pub = static_cast<CddsPublisher *> (publisher->data);
@ -712,14 +724,18 @@ static CddsPublisher *create_cdds_publisher (const rmw_node_t *node, const rosid
return nullptr; return nullptr;
} }
extern "C" rmw_ret_t rmw_init_publisher_allocation (const rosidl_message_type_support_t *type_support __attribute__ ((unused)), const rosidl_message_bounds_t *message_bounds __attribute__ ((unused)), rmw_publisher_allocation_t *allocation __attribute__ ((unused))) extern "C" rmw_ret_t rmw_init_publisher_allocation (const rosidl_message_type_support_t * type_support, const rosidl_message_bounds_t * message_bounds , rmw_publisher_allocation_t * allocation)
{ {
static_cast<void>(type_support);
static_cast<void>(message_bounds);
static_cast<void>(allocation);
RMW_SET_ERROR_MSG ("rmw_init_publisher_allocation: unimplemented"); RMW_SET_ERROR_MSG ("rmw_init_publisher_allocation: unimplemented");
return RMW_RET_ERROR; return RMW_RET_ERROR;
} }
extern "C" rmw_ret_t rmw_fini_publisher_allocation (rmw_publisher_allocation_t *allocation __attribute__ ((unused))) extern "C" rmw_ret_t rmw_fini_publisher_allocation (rmw_publisher_allocation_t *allocation)
{ {
static_cast<void>(allocation);
RMW_SET_ERROR_MSG ("rmw_fini_publisher_allocation: unimplemented"); RMW_SET_ERROR_MSG ("rmw_fini_publisher_allocation: unimplemented");
return RMW_RET_ERROR; return RMW_RET_ERROR;
} }
@ -879,14 +895,18 @@ static CddsSubscription *create_cdds_subscription (const rmw_node_t *node, const
return nullptr; return nullptr;
} }
extern "C" rmw_ret_t rmw_init_subscription_allocation (const rosidl_message_type_support_t *type_support __attribute__ ((unused)), const rosidl_message_bounds_t *message_bounds __attribute__ ((unused)), rmw_subscription_allocation_t *allocation __attribute__ ((unused))) extern "C" rmw_ret_t rmw_init_subscription_allocation (const rosidl_message_type_support_t *type_support, const rosidl_message_bounds_t *message_bounds, rmw_subscription_allocation_t *allocation)
{ {
static_cast<void>(type_support);
static_cast<void>(message_bounds);
static_cast<void>(allocation);
RMW_SET_ERROR_MSG ("rmw_init_subscription_allocation: unimplemented"); RMW_SET_ERROR_MSG ("rmw_init_subscription_allocation: unimplemented");
return RMW_RET_ERROR; return RMW_RET_ERROR;
} }
extern "C" rmw_ret_t rmw_fini_subscription_allocation (rmw_subscription_allocation_t *allocation __attribute__ ((unused))) extern "C" rmw_ret_t rmw_fini_subscription_allocation (rmw_subscription_allocation_t *allocation)
{ {
static_cast<void>(allocation);
RMW_SET_ERROR_MSG ("rmw_fini_subscription_allocation: unimplemented"); RMW_SET_ERROR_MSG ("rmw_fini_subscription_allocation: unimplemented");
return RMW_RET_ERROR; return RMW_RET_ERROR;
} }
@ -1027,28 +1047,34 @@ static rmw_ret_t rmw_take_ser_int (const rmw_subscription_t *subscription, rmw_s
return RMW_RET_OK; return RMW_RET_OK;
} }
extern "C" rmw_ret_t rmw_take (const rmw_subscription_t *subscription, void *ros_message, bool *taken, rmw_subscription_allocation_t *allocation __attribute__ ((unused))) extern "C" rmw_ret_t rmw_take (const rmw_subscription_t *subscription, void *ros_message, bool *taken, rmw_subscription_allocation_t *allocation)
{ {
static_cast<void>(allocation);
return rmw_take_int (subscription, ros_message, taken, nullptr); return rmw_take_int (subscription, ros_message, taken, nullptr);
} }
extern "C" rmw_ret_t rmw_take_with_info (const rmw_subscription_t *subscription, void *ros_message, bool *taken, rmw_message_info_t *message_info, rmw_subscription_allocation_t *allocation __attribute__ ((unused))) extern "C" rmw_ret_t rmw_take_with_info (const rmw_subscription_t *subscription, void *ros_message, bool *taken, rmw_message_info_t *message_info, rmw_subscription_allocation_t *allocation)
{ {
static_cast<void>(allocation);
return rmw_take_int (subscription, ros_message, taken, message_info); return rmw_take_int (subscription, ros_message, taken, message_info);
} }
extern "C" rmw_ret_t rmw_take_serialized_message (const rmw_subscription_t *subscription, rmw_serialized_message_t *serialized_message, bool *taken, rmw_subscription_allocation_t *allocation __attribute__ ((unused))) extern "C" rmw_ret_t rmw_take_serialized_message (const rmw_subscription_t *subscription, rmw_serialized_message_t *serialized_message, bool *taken, rmw_subscription_allocation_t *allocation)
{ {
static_cast<void>(allocation);
return rmw_take_ser_int (subscription, serialized_message, taken, nullptr); return rmw_take_ser_int (subscription, serialized_message, taken, nullptr);
} }
extern "C" rmw_ret_t rmw_take_serialized_message_with_info (const rmw_subscription_t *subscription, rmw_serialized_message_t *serialized_message, bool *taken, rmw_message_info_t *message_info, rmw_subscription_allocation_t *allocation __attribute__ ((unused))) extern "C" rmw_ret_t rmw_take_serialized_message_with_info (const rmw_subscription_t *subscription, rmw_serialized_message_t *serialized_message, bool *taken, rmw_message_info_t *message_info, rmw_subscription_allocation_t *allocation)
{ {
static_cast<void>(allocation);
return rmw_take_ser_int (subscription, serialized_message, taken, message_info); return rmw_take_ser_int (subscription, serialized_message, taken, message_info);
} }
extern "C" rmw_ret_t rmw_take_event (const rmw_events_t *event_handle __attribute__ ((unused)), void *event_info __attribute__ ((unused)), bool *taken) extern "C" rmw_ret_t rmw_take_event (const rmw_events_t *event_handle, void *event_info, bool *taken)
{ {
static_cast<void>(event_info);
static_cast<void>(event_handle);
RET_NULL (taken); RET_NULL (taken);
*taken = false; *taken = false;
return RMW_RET_OK; return RMW_RET_OK;
@ -1060,8 +1086,9 @@ extern "C" rmw_ret_t rmw_take_event (const rmw_events_t *event_handle __attribut
/////////// /////////// /////////// ///////////
///////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////
extern "C" rmw_guard_condition_t *rmw_create_guard_condition (rmw_context_t *context __attribute__ ((unused))) extern "C" rmw_guard_condition_t *rmw_create_guard_condition (rmw_context_t *context)
{ {
static_cast<void>(context);
rmw_guard_condition_t *guard_condition_handle; rmw_guard_condition_t *guard_condition_handle;
auto *gcond_impl = new CddsGuardCondition (); auto *gcond_impl = new CddsGuardCondition ();
if (ref_ppant () < 0) { if (ref_ppant () < 0) {
@ -1103,8 +1130,9 @@ extern "C" rmw_ret_t rmw_trigger_guard_condition (const rmw_guard_condition_t *g
return RMW_RET_OK; return RMW_RET_OK;
} }
extern "C" rmw_wait_set_t *rmw_create_wait_set (rmw_context_t *context __attribute__ ((unused)), size_t max_conditions) extern "C" rmw_wait_set_t *rmw_create_wait_set (rmw_context_t *context, size_t max_conditions)
{ {
static_cast<void>(context);
(void) max_conditions; (void) max_conditions;
rmw_wait_set_t *wait_set = rmw_wait_set_allocate (); rmw_wait_set_t *wait_set = rmw_wait_set_allocate ();
CddsWaitset *ws = nullptr; CddsWaitset *ws = nullptr;
@ -1197,8 +1225,9 @@ static void clean_waitset_caches ()
} }
} }
extern "C" rmw_ret_t rmw_wait (rmw_subscriptions_t *subs, rmw_guard_conditions_t *gcs, rmw_services_t *srvs, rmw_clients_t *cls, rmw_events_t *evs __attribute__ ((unused)), rmw_wait_set_t *wait_set, const rmw_time_t *wait_timeout) extern "C" rmw_ret_t rmw_wait (rmw_subscriptions_t *subs, rmw_guard_conditions_t *gcs, rmw_services_t *srvs, rmw_clients_t *cls, rmw_events_t *evs, rmw_wait_set_t *wait_set, const rmw_time_t *wait_timeout)
{ {
static_cast<void>(evs);
RET_NULL (wait_set); RET_NULL (wait_set);
CddsWaitset *ws = static_cast<CddsWaitset *> (wait_set->data); CddsWaitset *ws = static_cast<CddsWaitset *> (wait_set->data);
RET_NULL (ws); RET_NULL (ws);
@ -1610,8 +1639,9 @@ extern "C" rmw_ret_t rmw_get_node_names (const rmw_node_t *node, rcutils_string_
std::set< std::pair<std::string, std::string> > ns; std::set< std::pair<std::string, std::string> > ns;
const auto re = std::regex ("^name=(.*);namespace=(.*);$", std::regex::extended); const auto re = std::regex ("^name=(.*);namespace=(.*);$", std::regex::extended);
auto oper = auto oper =
[&ns, re](const dds_builtintopic_participant_t& sample __attribute__ ((unused)), const char *ud) -> bool { [&ns, re](const dds_builtintopic_participant_t& sample, const char *ud) -> bool {
std::cmatch cm; std::cmatch cm;
static_cast<void>(sample);
if (std::regex_search (ud, cm, re)) { if (std::regex_search (ud, cm, re)) {
ns.insert (std::make_pair (std::string (cm[1]), std::string (cm[2]))); ns.insert (std::make_pair (std::string (cm[1]), std::string (cm[2])));
} }

40
rmw_cyclonedds_cpp/src/serdata.cpp
View file

@ -85,7 +85,7 @@ void *create_response_type_support (const void *untyped_members, const char *typ
static uint32_t serdata_rmw_size (const struct ddsi_serdata *dcmn) static uint32_t serdata_rmw_size (const struct ddsi_serdata *dcmn)
{ {
const struct serdata_rmw *d = static_cast<const struct serdata_rmw *> (dcmn); const struct serdata_rmw *d = static_cast<const struct serdata_rmw *> (dcmn);
return d->data.size (); return static_cast<uint32_t>(d->data.size());
} }
static void serdata_rmw_free (struct ddsi_serdata *dcmn) static void serdata_rmw_free (struct ddsi_serdata *dcmn)
@ -120,8 +120,9 @@ static struct ddsi_serdata *serdata_rmw_from_ser (const struct ddsi_sertopic *to
return d; return d;
} }
static struct ddsi_serdata *serdata_rmw_from_keyhash (const struct ddsi_sertopic *topic, const struct nn_keyhash *keyhash __attribute__ ((unused))) static struct ddsi_serdata *serdata_rmw_from_keyhash (const struct ddsi_sertopic *topic, const struct nn_keyhash *keyhash)
{ {
static_cast<void>(keyhash); // unused
/* there is no key field, so from_keyhash is trivial */ /* there is no key field, so from_keyhash is trivial */
return rmw_serdata_new (topic, SDK_KEY); return rmw_serdata_new (topic, SDK_KEY);
} }
@ -200,14 +201,17 @@ static struct ddsi_serdata *serdata_rmw_to_ser_ref (const struct ddsi_serdata *d
return ddsi_serdata_ref (d); return ddsi_serdata_ref (d);
} }
static void serdata_rmw_to_ser_unref (struct ddsi_serdata *dcmn, const ddsrt_iovec_t *ref __attribute__ ((unused))) static void serdata_rmw_to_ser_unref (struct ddsi_serdata *dcmn, const ddsrt_iovec_t *ref)
{ {
static_cast<void>(ref); // unused
struct serdata_rmw *d = static_cast<struct serdata_rmw *> (dcmn); struct serdata_rmw *d = static_cast<struct serdata_rmw *> (dcmn);
ddsi_serdata_unref (d); ddsi_serdata_unref (d);
} }
static bool serdata_rmw_to_sample (const struct ddsi_serdata *dcmn, void *sample, void **bufptr __attribute__ ((unused)), void *buflim __attribute__ ((unused))) static bool serdata_rmw_to_sample (const struct ddsi_serdata *dcmn, void *sample, void **bufptr, void *buflim)
{ {
static_cast<void>(bufptr); // unused
static_cast<void>(buflim); // unused
const struct serdata_rmw *d = static_cast<const struct serdata_rmw *> (dcmn); const struct serdata_rmw *d = static_cast<const struct serdata_rmw *> (dcmn);
const struct sertopic_rmw *topic = static_cast<const struct sertopic_rmw *> (d->topic); const struct sertopic_rmw *topic = static_cast<const struct sertopic_rmw *> (d->topic);
assert (bufptr == NULL); assert (bufptr == NULL);
@ -241,14 +245,21 @@ static bool serdata_rmw_to_sample (const struct ddsi_serdata *dcmn, void *sample
return false; return false;
} }
static bool serdata_rmw_topicless_to_sample (const struct ddsi_sertopic *topic __attribute__ ((unused)), const struct ddsi_serdata *dcmn __attribute__ ((unused)), void *sample __attribute__ ((unused)), void **bufptr __attribute__ ((unused)), void *buflim __attribute__ ((unused))) static bool serdata_rmw_topicless_to_sample (const struct ddsi_sertopic *topic, const struct ddsi_serdata *dcmn, void *sample, void **bufptr, void *buflim)
{ {
static_cast<void>(topic);
static_cast<void>(dcmn);
static_cast<void>(sample);
static_cast<void>(bufptr);
static_cast<void>(buflim);
/* ROS2 doesn't do keys in a meaningful way yet */ /* ROS2 doesn't do keys in a meaningful way yet */
return true; return true;
} }
static bool serdata_rmw_eqkey (const struct ddsi_serdata *a __attribute__ ((unused)), const struct ddsi_serdata *b __attribute__ ((unused))) static bool serdata_rmw_eqkey (const struct ddsi_serdata *a, const struct ddsi_serdata *b)
{ {
static_cast<void>(a);
static_cast<void>(b);
/* ROS2 doesn't do keys in a meaningful way yet */ /* ROS2 doesn't do keys in a meaningful way yet */
return true; return true;
} }
@ -274,20 +285,31 @@ static void sertopic_rmw_free (struct ddsi_sertopic *tpcmn)
delete tp; delete tp;
} }
static void sertopic_rmw_zero_samples (const struct ddsi_sertopic *d __attribute__ ((unused)), void *samples __attribute__ ((unused)), size_t count __attribute__ ((unused))) static void sertopic_rmw_zero_samples (const struct ddsi_sertopic *d, void *samples, size_t count)
{ {
static_cast<void>(d);
static_cast<void>(samples);
static_cast<void>(count);
/* Not using code paths that rely on the samples getting zero'd out */ /* Not using code paths that rely on the samples getting zero'd out */
} }
static void sertopic_rmw_realloc_samples (void **ptrs __attribute__ ((unused)), const struct ddsi_sertopic *d __attribute__ ((unused)), void *old __attribute__ ((unused)), size_t oldcount __attribute__ ((unused)), size_t count __attribute__ ((unused))) static void sertopic_rmw_realloc_samples (void **ptrs, const struct ddsi_sertopic *d, void *old, size_t oldcount, size_t count)
{ {
static_cast<void>(ptrs);
static_cast<void>(d);
static_cast<void>(old);
static_cast<void>(oldcount);
static_cast<void>(count);
/* Not using code paths that rely on this (loans, dispose, unregister with instance handle, /* Not using code paths that rely on this (loans, dispose, unregister with instance handle,
content filters) */ content filters) */
abort (); abort ();
} }
static void sertopic_rmw_free_samples (const struct ddsi_sertopic *d __attribute__ ((unused)), void **ptrs __attribute__ ((unused)), size_t count __attribute__ ((unused)), dds_free_op_t op) static void sertopic_rmw_free_samples (const struct ddsi_sertopic *d, void **ptrs, size_t count, dds_free_op_t op)
{ {
static_cast<void>(d); // unused
static_cast<void>(ptrs); // unused
static_cast<void>(count); // unused
/* Not using code paths that rely on this (dispose, unregister with instance handle, content /* Not using code paths that rely on this (dispose, unregister with instance handle, content
filters) */ filters) */
assert (!(op & DDS_FREE_ALL_BIT)); assert (!(op & DDS_FREE_ALL_BIT));