From 1d853818e1bba464aeb1361a9df37dc43614657a Mon Sep 17 00:00:00 2001 From: Michel Hidalgo Date: Tue, 14 Sep 2021 12:53:38 -0300 Subject: [PATCH] Use _t types wherever possible Signed-off-by: Michel Hidalgo --- rcl/include/rcl/arguments.h | 2 +- rcl/include/rcl/client.h | 2 +- rcl/include/rcl/context.h | 2 +- rcl/include/rcl/event.h | 2 +- rcl/include/rcl/guard_condition.h | 2 +- rcl/include/rcl/init_options.h | 2 +- rcl/include/rcl/lexer_lookahead.h | 2 +- rcl/include/rcl/node.h | 7 +++---- rcl/include/rcl/publisher.h | 2 +- rcl/include/rcl/remap.h | 2 +- rcl/include/rcl/service.h | 2 +- rcl/include/rcl/subscription.h | 2 +- rcl/include/rcl/timer.h | 4 +--- rcl/include/rcl/wait.h | 2 +- 14 files changed, 16 insertions(+), 19 deletions(-) diff --git a/rcl/include/rcl/arguments.h b/rcl/include/rcl/arguments.h index 12de4e6884..44c99f6a9f 100644 --- a/rcl/include/rcl/arguments.h +++ b/rcl/include/rcl/arguments.h @@ -35,7 +35,7 @@ typedef struct rcl_arguments_impl_s rcl_arguments_impl_t; typedef struct rcl_arguments_s { /// Private implementation pointer. - struct rcl_arguments_impl_s * impl; + rcl_arguments_impl_t * impl; } rcl_arguments_t; /// The command-line flag that delineates the start of ROS arguments. diff --git a/rcl/include/rcl/client.h b/rcl/include/rcl/client.h index 731a6c9f93..39715f181b 100644 --- a/rcl/include/rcl/client.h +++ b/rcl/include/rcl/client.h @@ -35,7 +35,7 @@ typedef struct rcl_client_impl_s rcl_client_impl_t; typedef struct rcl_client_s { /// Pointer to the client implementation - struct rcl_client_impl_s * impl; + rcl_client_impl_t * impl; } rcl_client_t; /// Options available for a rcl_client_t. diff --git a/rcl/include/rcl/context.h b/rcl/include/rcl/context.h index b9f6cda49f..68500da817 100644 --- a/rcl/include/rcl/context.h +++ b/rcl/include/rcl/context.h @@ -117,7 +117,7 @@ typedef struct rcl_context_s rcl_arguments_t global_arguments; /// Implementation specific pointer. - struct rcl_context_impl_s * impl; + rcl_context_impl_t * impl; // The assumption that this is big enough for an atomic_uint_least64_t is // ensured with a static_assert in the context.c file. diff --git a/rcl/include/rcl/event.h b/rcl/include/rcl/event.h index 482e4227af..96ba5eb8f6 100644 --- a/rcl/include/rcl/event.h +++ b/rcl/include/rcl/event.h @@ -56,7 +56,7 @@ typedef struct rcl_event_impl_s rcl_event_impl_t; typedef struct rcl_event_s { /// Pointer to the event implementation - struct rcl_event_impl_s * impl; + rcl_event_impl_t * impl; } rcl_event_t; /// Return a rcl_event_t struct with members set to `NULL`. diff --git a/rcl/include/rcl/guard_condition.h b/rcl/include/rcl/guard_condition.h index 1a7fdbdc39..368a9a6b4d 100644 --- a/rcl/include/rcl/guard_condition.h +++ b/rcl/include/rcl/guard_condition.h @@ -38,7 +38,7 @@ typedef struct rcl_guard_condition_s rcl_context_t * context; /// Pointer to the guard condition implementation - struct rcl_guard_condition_impl_s * impl; + rcl_guard_condition_impl_t * impl; } rcl_guard_condition_t; /// Options available for a rcl guard condition. diff --git a/rcl/include/rcl/init_options.h b/rcl/include/rcl/init_options.h index 731ec8c898..f80dd77594 100644 --- a/rcl/include/rcl/init_options.h +++ b/rcl/include/rcl/init_options.h @@ -35,7 +35,7 @@ typedef struct rcl_init_options_impl_s rcl_init_options_impl_t; typedef struct rcl_init_options_s { /// Implementation specific pointer. - struct rcl_init_options_impl_s * impl; + rcl_init_options_impl_t * impl; } rcl_init_options_t; /// Return a zero initialized rcl_init_options_t struct. diff --git a/rcl/include/rcl/lexer_lookahead.h b/rcl/include/rcl/lexer_lookahead.h index ef9a8a8b04..2bf523ca71 100644 --- a/rcl/include/rcl/lexer_lookahead.h +++ b/rcl/include/rcl/lexer_lookahead.h @@ -37,7 +37,7 @@ typedef struct rcl_lexer_lookahead2_impl_s rcl_lexer_lookahead2_impl_t; typedef struct rcl_lexer_lookahead2_s { /// Pointer to the lexer look ahead2 implementation - struct rcl_lexer_lookahead2_impl_s * impl; + rcl_lexer_lookahead2_impl_t * impl; } rcl_lexer_lookahead2_t; /// Get a zero initialized rcl_lexer_lookahead2_t instance. diff --git a/rcl/include/rcl/node.h b/rcl/include/rcl/node.h index 588b4bb9e3..fafaa04df3 100644 --- a/rcl/include/rcl/node.h +++ b/rcl/include/rcl/node.h @@ -27,13 +27,12 @@ extern "C" #include "rcl/allocator.h" #include "rcl/arguments.h" #include "rcl/context.h" +#include "rcl/guard_condition.h" #include "rcl/macros.h" #include "rcl/node_options.h" #include "rcl/types.h" #include "rcl/visibility_control.h" -struct rcl_guard_condition_s; - typedef struct rcl_node_impl_s rcl_node_impl_t; /// Structure which encapsulates a ROS Node. @@ -43,7 +42,7 @@ typedef struct rcl_node_s rcl_context_t * context; /// Private implementation pointer. - struct rcl_node_impl_s * impl; + rcl_node_impl_t * impl; } rcl_node_t; /// Return a rcl_node_t struct with members initialized to `NULL`. @@ -463,7 +462,7 @@ rcl_node_get_rcl_instance_id(const rcl_node_t * node); */ RCL_PUBLIC RCL_WARN_UNUSED -const struct rcl_guard_condition_s * +const rcl_guard_condition_t * rcl_node_get_graph_guard_condition(const rcl_node_t * node); /// Return the logger name of the node. diff --git a/rcl/include/rcl/publisher.h b/rcl/include/rcl/publisher.h index 32881474dc..c39f5cfc53 100644 --- a/rcl/include/rcl/publisher.h +++ b/rcl/include/rcl/publisher.h @@ -36,7 +36,7 @@ typedef struct rcl_publisher_impl_s rcl_publisher_impl_t; typedef struct rcl_publisher_s { /// Pointer to the publisher implementation - struct rcl_publisher_impl_s * impl; + rcl_publisher_impl_t * impl; } rcl_publisher_t; /// Options available for a rcl publisher. diff --git a/rcl/include/rcl/remap.h b/rcl/include/rcl/remap.h index 09ec617e06..5acf5e48e0 100644 --- a/rcl/include/rcl/remap.h +++ b/rcl/include/rcl/remap.h @@ -34,7 +34,7 @@ typedef struct rcl_remap_impl_s rcl_remap_impl_t; typedef struct rcl_remap_s { /// Private implementation pointer. - struct rcl_remap_impl_s * impl; + rcl_remap_impl_t * impl; } rcl_remap_t; /// Return a rcl_remap_t struct with members initialized to `NULL`. diff --git a/rcl/include/rcl/service.h b/rcl/include/rcl/service.h index 44aa95f3da..82c33c110e 100644 --- a/rcl/include/rcl/service.h +++ b/rcl/include/rcl/service.h @@ -35,7 +35,7 @@ typedef struct rcl_service_impl_s rcl_service_impl_t; typedef struct rcl_service_s { /// Pointer to the service implementation - struct rcl_service_impl_s * impl; + rcl_service_impl_t * impl; } rcl_service_t; /// Options available for a rcl service. diff --git a/rcl/include/rcl/subscription.h b/rcl/include/rcl/subscription.h index d749ce65e5..09d6e6bc4f 100644 --- a/rcl/include/rcl/subscription.h +++ b/rcl/include/rcl/subscription.h @@ -37,7 +37,7 @@ typedef struct rcl_subscription_impl_s rcl_subscription_impl_t; typedef struct rcl_subscription_s { /// Pointer to the subscription implementation - struct rcl_subscription_impl_s * impl; + rcl_subscription_impl_t * impl; } rcl_subscription_t; /// Options available for a rcl subscription. diff --git a/rcl/include/rcl/timer.h b/rcl/include/rcl/timer.h index d8d73567f8..1bf9212d76 100644 --- a/rcl/include/rcl/timer.h +++ b/rcl/include/rcl/timer.h @@ -32,15 +32,13 @@ extern "C" #include "rcl/types.h" #include "rmw/rmw.h" -struct rcl_clock_s; - typedef struct rcl_timer_impl_s rcl_timer_impl_t; /// Structure which encapsulates a ROS Timer. typedef struct rcl_timer_s { /// Private implementation pointer. - struct rcl_timer_impl_s * impl; + rcl_timer_impl_t * impl; } rcl_timer_t; /// User callback signature for timers. diff --git a/rcl/include/rcl/wait.h b/rcl/include/rcl/wait.h index c72228cb1c..60e21a291b 100644 --- a/rcl/include/rcl/wait.h +++ b/rcl/include/rcl/wait.h @@ -65,7 +65,7 @@ typedef struct rcl_wait_set_s /// Number of events size_t size_of_events; /// Implementation specific storage. - struct rcl_wait_set_impl_s * impl; + rcl_wait_set_impl_t * impl; } rcl_wait_set_t; /// Return a rcl_wait_set_t struct with members set to `NULL`.