From 40d899adfdd87dc8199dcf80408c70179b0f2ce4 Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Tue, 14 Nov 2017 13:01:26 -0800 Subject: [PATCH] clean up includes include what you use and style fixups. --- rcl/src/rcl/client.c | 1 + rcl/src/rcl/common.c | 1 + rcl/src/rcl/common.h | 1 - rcl/src/rcl/graph.c | 13 +++++++------ rcl/src/rcl/guard_condition.c | 2 +- rcl/src/rcl/node.c | 1 + rcl/src/rcl/publisher.c | 2 +- rcl/src/rcl/rcl.c | 1 - rcl/src/rcl/rmw_implementation_identifier_check.c | 5 +++-- rcl/src/rcl/service.c | 2 +- rcl/src/rcl/subscription.c | 2 +- rcl/src/rcl/timer.c | 2 +- rcl/src/rcl/validate_topic_name.c | 2 +- rcl/src/rcl/wait.c | 1 - 14 files changed, 19 insertions(+), 17 deletions(-) diff --git a/rcl/src/rcl/client.c b/rcl/src/rcl/client.c index eb51e36..f26043f 100644 --- a/rcl/src/rcl/client.c +++ b/rcl/src/rcl/client.c @@ -22,6 +22,7 @@ extern "C" #include #include +#include "rcl/error_handling.h" #include "rcl/expand_topic_name.h" #include "rcutils/logging_macros.h" #include "rmw/error_handling.h" diff --git a/rcl/src/rcl/common.c b/rcl/src/rcl/common.c index ca96599..18a72f5 100644 --- a/rcl/src/rcl/common.c +++ b/rcl/src/rcl/common.c @@ -22,6 +22,7 @@ extern "C" #include #include "rcl/allocator.h" +#include "rcl/error_handling.h" #if defined(_WIN32) # define WINDOWS_ENV_BUFFER_SIZE 2048 diff --git a/rcl/src/rcl/common.h b/rcl/src/rcl/common.h index 3a05b34..f8c0c89 100644 --- a/rcl/src/rcl/common.h +++ b/rcl/src/rcl/common.h @@ -20,7 +20,6 @@ extern "C" { #endif -#include "rcl/error_handling.h" #include "rcl/types.h" /// Retrieve the value of the given environment variable if it exists, or "". diff --git a/rcl/src/rcl/graph.c b/rcl/src/rcl/graph.c index 2d141df..fd226a9 100644 --- a/rcl/src/rcl/graph.c +++ b/rcl/src/rcl/graph.c @@ -19,12 +19,13 @@ extern "C" #include "rcl/graph.h" -#include -#include -#include -#include -#include -#include +#include "rcl/error_handling.h" +#include "rcutils/allocator.h" +#include "rcutils/types.h" +#include "rmw/get_service_names_and_types.h" +#include "rmw/get_topic_names_and_types.h" +#include "rmw/names_and_types.h" +#include "rmw/rmw.h" #include "./common.h" diff --git a/rcl/src/rcl/guard_condition.c b/rcl/src/rcl/guard_condition.c index 2c54b13..599ee20 100644 --- a/rcl/src/rcl/guard_condition.c +++ b/rcl/src/rcl/guard_condition.c @@ -19,7 +19,7 @@ extern "C" #include "rcl/guard_condition.h" -#include "./common.h" +#include "rcl/error_handling.h" #include "rcl/rcl.h" #include "rmw/error_handling.h" #include "rmw/rmw.h" diff --git a/rcl/src/rcl/node.c b/rcl/src/rcl/node.c index 5bd0639..72ae5db 100644 --- a/rcl/src/rcl/node.c +++ b/rcl/src/rcl/node.c @@ -24,6 +24,7 @@ extern "C" #include #include +#include "rcl/error_handling.h" #include "rcl/rcl.h" #include "rcutils/filesystem.h" #include "rcutils/get_env.h" diff --git a/rcl/src/rcl/publisher.c b/rcl/src/rcl/publisher.c index 4220884..ff7e2d9 100644 --- a/rcl/src/rcl/publisher.c +++ b/rcl/src/rcl/publisher.c @@ -22,8 +22,8 @@ extern "C" #include #include -#include "./common.h" #include "rcl/allocator.h" +#include "rcl/error_handling.h" #include "rcl/expand_topic_name.h" #include "rcutils/logging_macros.h" #include "rmw/error_handling.h" diff --git a/rcl/src/rcl/rcl.c b/rcl/src/rcl/rcl.c index 3b25456..c91717d 100644 --- a/rcl/src/rcl/rcl.c +++ b/rcl/src/rcl/rcl.c @@ -21,7 +21,6 @@ extern "C" #include -#include "./common.h" #include "./stdatomic_helper.h" #include "rcl/error_handling.h" #include "rmw/error_handling.h" diff --git a/rcl/src/rcl/rmw_implementation_identifier_check.c b/rcl/src/rcl/rmw_implementation_identifier_check.c index 3356622..f7e7a18 100644 --- a/rcl/src/rcl/rmw_implementation_identifier_check.c +++ b/rcl/src/rcl/rmw_implementation_identifier_check.c @@ -21,8 +21,9 @@ extern "C" #include #include -#include -#include +#include "rcl/error_handling.h" +#include "rcutils/logging_macros.h" +#include "rmw/rmw.h" #include "rcl/types.h" #include "./common.h" diff --git a/rcl/src/rcl/service.c b/rcl/src/rcl/service.c index e25daa2..fc89d00 100644 --- a/rcl/src/rcl/service.c +++ b/rcl/src/rcl/service.c @@ -22,7 +22,7 @@ extern "C" #include #include -#include "./common.h" +#include "rcl/error_handling.h" #include "rcl/expand_topic_name.h" #include "rcutils/logging_macros.h" #include "rmw/error_handling.h" diff --git a/rcl/src/rcl/subscription.c b/rcl/src/rcl/subscription.c index d1a9a9e..e7d22de 100644 --- a/rcl/src/rcl/subscription.c +++ b/rcl/src/rcl/subscription.c @@ -21,7 +21,7 @@ extern "C" #include -#include "./common.h" +#include "rcl/error_handling.h" #include "rcl/expand_topic_name.h" #include "rcutils/logging_macros.h" #include "rmw/error_handling.h" diff --git a/rcl/src/rcl/timer.c b/rcl/src/rcl/timer.c index 9689866..936890c 100644 --- a/rcl/src/rcl/timer.c +++ b/rcl/src/rcl/timer.c @@ -19,8 +19,8 @@ extern "C" #include "rcl/timer.h" -#include "./common.h" #include "./stdatomic_helper.h" +#include "rcl/error_handling.h" #include "rcutils/time.h" typedef struct rcl_timer_impl_t diff --git a/rcl/src/rcl/validate_topic_name.c b/rcl/src/rcl/validate_topic_name.c index b0949d4..e7a9878 100644 --- a/rcl/src/rcl/validate_topic_name.c +++ b/rcl/src/rcl/validate_topic_name.c @@ -22,8 +22,8 @@ extern "C" #include #include -#include "./common.h" #include "rcl/allocator.h" +#include "rcl/error_handling.h" #include "rcutils/isalnum_no_locale.h" rcl_ret_t diff --git a/rcl/src/rcl/wait.c b/rcl/src/rcl/wait.c index 65fc94c..a6c562c 100644 --- a/rcl/src/rcl/wait.c +++ b/rcl/src/rcl/wait.c @@ -23,7 +23,6 @@ extern "C" #include #include -#include "./common.h" #include "./stdatomic_helper.h" #include "rcl/error_handling.h" #include "rcl/time.h"