Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Uncrustify 0.67 #266

Merged
merged 2 commits into from
Jul 11, 2018
Merged

Uncrustify 0.67 #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73188ef
fix indentation to comply with uncrusity 0.67
mikaelarguedas Jul 6, 2018
9fe5739
fix spacing to comply with uncrusity 0.67
mikaelarguedas Jul 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions rcl/src/rcl/graph.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -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);
}

Expand Down Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion rcl/src/rcl/rmw_implementation_identifier_check.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rcl/src/rcl/wait.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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", \
Expand Down