From 73188efd74d1f01e688454688d97c6c6018ed62f Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Thu, 5 Jul 2018 19:11:30 -0700 Subject: [PATCH 1/2] fix indentation to comply with uncrusity 0.67 --- rcl/src/rcl/graph.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rcl/src/rcl/graph.c b/rcl/src/rcl/graph.c index 4022b5de4..dacadec35 100644 --- a/rcl/src/rcl/graph.c +++ b/rcl/src/rcl/graph.c @@ -53,7 +53,7 @@ rcl_get_topic_names_and_types( &rcutils_allocator, no_demangle, topic_names_and_types - ); + ); return rcl_convert_rmw_ret_to_rcl_ret(rmw_ret); } @@ -78,7 +78,7 @@ rcl_get_service_names_and_types( rcl_node_get_rmw_handle(node), &rcutils_allocator, service_names_and_types - ); + ); return rcl_convert_rmw_ret_to_rcl_ret(rmw_ret); } @@ -176,7 +176,7 @@ rcl_service_server_is_available( rcl_node_get_rmw_handle(node), rcl_client_get_rmw_handle(client), is_available - ); + ); return rcl_convert_rmw_ret_to_rcl_ret(rmw_ret); } From 9fe5739374b5d93916435de591059853382b0255 Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Thu, 5 Jul 2018 19:11:56 -0700 Subject: [PATCH 2/2] fix spacing to comply with uncrusity 0.67 --- rcl/src/rcl/rmw_implementation_identifier_check.c | 2 +- rcl/src/rcl/wait.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rcl/src/rcl/rmw_implementation_identifier_check.c b/rcl/src/rcl/rmw_implementation_identifier_check.c index af0f0d382..64b704b17 100644 --- a/rcl/src/rcl/rmw_implementation_identifier_check.c +++ b/rcl/src/rcl/rmw_implementation_identifier_check.c @@ -38,7 +38,7 @@ extern "C" #pragma section(".CRT$XCU", read) #define INITIALIZER2_(f, p) \ static void f(void); \ - __declspec(allocate(".CRT$XCU")) void (*f ## _)(void) = f; \ + __declspec(allocate(".CRT$XCU")) void(*f ## _)(void) = f; \ __pragma(comment(linker, "/include:" p #f "_")) \ static void f(void) #ifdef _WIN64 diff --git a/rcl/src/rcl/wait.c b/rcl/src/rcl/wait.c index 0ce0f20b3..e3a0e3454 100644 --- a/rcl/src/rcl/wait.c +++ b/rcl/src/rcl/wait.c @@ -304,7 +304,7 @@ rcl_wait_set_get_allocator(const rcl_wait_set_t * wait_set, rcl_allocator_t * al } \ ExtraDealloc \ } else { \ - wait_set->Type ## s = (const rcl_ ## Type ## _t * *)allocator.reallocate( \ + wait_set->Type ## s = (const rcl_ ## Type ## _t **)allocator.reallocate( \ (void *)wait_set->Type ## s, sizeof(rcl_ ## Type ## _t *) * size, allocator.state); \ RCL_CHECK_FOR_NULL_WITH_MSG( \ wait_set->Type ## s, "allocating memory failed", \