From a440a2022079b577600be443243f2434f270fce2 Mon Sep 17 00:00:00 2001 From: William Woodall Date: Tue, 30 Oct 2018 18:54:32 -0500 Subject: [PATCH] use semicolons after macros Signed-off-by: William Woodall --- rcl/src/rcl/client.c | 6 +++--- rcl/src/rcl/expand_topic_name.c | 34 +++++++++++++++---------------- rcl/src/rcl/graph.c | 5 +++-- rcl/src/rcl/publisher.c | 4 ++-- rcl/src/rcl/service.c | 6 +++--- rcl/src/rcl/subscription.c | 6 +++--- rcl/src/rcl/time.c | 14 ++++++------- rcl/src/rcl/validate_topic_name.c | 6 +++--- rcl_lifecycle/src/com_interface.c | 16 +++++++-------- 9 files changed, 49 insertions(+), 48 deletions(-) diff --git a/rcl/src/rcl/client.c b/rcl/src/rcl/client.c index 9f4c5368c5..5686753259 100644 --- a/rcl/src/rcl/client.c +++ b/rcl/src/rcl/client.c @@ -79,7 +79,7 @@ rcl_client_init( rcutils_string_map_t substitutions_map = rcutils_get_zero_initialized_string_map(); rcutils_ret_t rcutils_ret = rcutils_string_map_init(&substitutions_map, 0, rcutils_allocator); if (rcutils_ret != RCUTILS_RET_OK) { - RCL_SET_ERROR_MSG(rcutils_get_error_string().str) + RCL_SET_ERROR_MSG(rcutils_get_error_string().str); if (rcutils_ret == RCUTILS_RET_BAD_ALLOC) { return RCL_RET_BAD_ALLOC; } @@ -111,7 +111,7 @@ rcl_client_init( &expanded_service_name); rcutils_ret = rcutils_string_map_fini(&substitutions_map); if (rcutils_ret != RCUTILS_RET_OK) { - RCL_SET_ERROR_MSG(rcutils_get_error_string().str) + RCL_SET_ERROR_MSG(rcutils_get_error_string().str); allocator->deallocate(expanded_service_name, allocator->state); return RCL_RET_ERROR; } @@ -153,7 +153,7 @@ rcl_client_init( goto cleanup; } if (validation_result != RMW_TOPIC_VALID) { - RCL_SET_ERROR_MSG(rmw_full_topic_name_validation_result_string(validation_result)) + RCL_SET_ERROR_MSG(rmw_full_topic_name_validation_result_string(validation_result)); ret = RCL_RET_SERVICE_NAME_INVALID; goto cleanup; } diff --git a/rcl/src/rcl/expand_topic_name.c b/rcl/src/rcl/expand_topic_name.c index 6ab41b3a8b..24c90c55ec 100644 --- a/rcl/src/rcl/expand_topic_name.c +++ b/rcl/src/rcl/expand_topic_name.c @@ -50,11 +50,11 @@ rcl_expand_topic_name( char ** output_topic_name) { // check arguments that could be null - RCL_CHECK_ARGUMENT_FOR_NULL(input_topic_name, RCL_RET_INVALID_ARGUMENT) - RCL_CHECK_ARGUMENT_FOR_NULL(node_name, RCL_RET_INVALID_ARGUMENT) - RCL_CHECK_ARGUMENT_FOR_NULL(node_namespace, RCL_RET_INVALID_ARGUMENT) - RCL_CHECK_ARGUMENT_FOR_NULL(substitutions, RCL_RET_INVALID_ARGUMENT) - RCL_CHECK_ARGUMENT_FOR_NULL(output_topic_name, RCL_RET_INVALID_ARGUMENT) + RCL_CHECK_ARGUMENT_FOR_NULL(input_topic_name, RCL_RET_INVALID_ARGUMENT); + RCL_CHECK_ARGUMENT_FOR_NULL(node_name, RCL_RET_INVALID_ARGUMENT); + RCL_CHECK_ARGUMENT_FOR_NULL(node_namespace, RCL_RET_INVALID_ARGUMENT); + RCL_CHECK_ARGUMENT_FOR_NULL(substitutions, RCL_RET_INVALID_ARGUMENT); + RCL_CHECK_ARGUMENT_FOR_NULL(output_topic_name, RCL_RET_INVALID_ARGUMENT); // validate the input topic int validation_result; rcl_ret_t ret = rcl_validate_topic_name(input_topic_name, &validation_result, NULL); @@ -63,14 +63,14 @@ rcl_expand_topic_name( return ret; } if (validation_result != RCL_TOPIC_NAME_VALID) { - RCL_SET_ERROR_MSG("topic name is invalid") + RCL_SET_ERROR_MSG("topic name is invalid"); return RCL_RET_TOPIC_NAME_INVALID; } // validate the node name rmw_ret_t rmw_ret; rmw_ret = rmw_validate_node_name(node_name, &validation_result, NULL); if (rmw_ret != RMW_RET_OK) { - RCL_SET_ERROR_MSG(rmw_get_error_string().str) + RCL_SET_ERROR_MSG(rmw_get_error_string().str); switch (rmw_ret) { case RMW_RET_INVALID_ARGUMENT: return RCL_RET_INVALID_ARGUMENT; @@ -81,13 +81,13 @@ rcl_expand_topic_name( } } if (validation_result != RMW_NODE_NAME_VALID) { - RCL_SET_ERROR_MSG("node name is invalid") + RCL_SET_ERROR_MSG("node name is invalid"); return RCL_RET_NODE_INVALID_NAME; } // validate the namespace rmw_ret = rmw_validate_namespace(node_namespace, &validation_result, NULL); if (rmw_ret != RMW_RET_OK) { - RCL_SET_ERROR_MSG(rmw_get_error_string().str) + RCL_SET_ERROR_MSG(rmw_get_error_string().str); switch (rmw_ret) { case RMW_RET_INVALID_ARGUMENT: return RCL_RET_INVALID_ARGUMENT; @@ -98,7 +98,7 @@ rcl_expand_topic_name( } } if (validation_result != RMW_NODE_NAME_VALID) { - RCL_SET_ERROR_MSG("node namespace is invalid") + RCL_SET_ERROR_MSG("node namespace is invalid"); return RCL_RET_NODE_INVALID_NAMESPACE; } // check if the topic has substitutions to be made @@ -111,7 +111,7 @@ rcl_expand_topic_name( *output_topic_name = rcutils_strdup(input_topic_name, allocator); if (!*output_topic_name) { *output_topic_name = NULL; - RCL_SET_ERROR_MSG("failed to allocate memory for output topic") + RCL_SET_ERROR_MSG("failed to allocate memory for output topic"); return RCL_RET_BAD_ALLOC; } return RCL_RET_OK; @@ -126,7 +126,7 @@ rcl_expand_topic_name( rcutils_format_string(allocator, fmt, node_namespace, node_name, input_topic_name + 1); if (!local_output) { *output_topic_name = NULL; - RCL_SET_ERROR_MSG("failed to allocate memory for output topic") + RCL_SET_ERROR_MSG("failed to allocate memory for output topic"); return RCL_RET_BAD_ALLOC; } } @@ -183,7 +183,7 @@ rcl_expand_topic_name( rcutils_strndup(next_opening_brace, substitution_substr_len, allocator); if (!next_substitution) { *output_topic_name = NULL; - RCL_SET_ERROR_MSG("failed to allocate memory for substitution") + RCL_SET_ERROR_MSG("failed to allocate memory for substitution"); allocator.deallocate(local_output, allocator.state); return RCL_RET_BAD_ALLOC; } @@ -193,7 +193,7 @@ rcl_expand_topic_name( allocator.deallocate(original_local_output, allocator.state); // free no matter what if (!local_output) { *output_topic_name = NULL; - RCL_SET_ERROR_MSG("failed to allocate memory for expanded topic") + RCL_SET_ERROR_MSG("failed to allocate memory for expanded topic"); return RCL_RET_BAD_ALLOC; } current_output = local_output; @@ -216,7 +216,7 @@ rcl_expand_topic_name( } if (!local_output) { *output_topic_name = NULL; - RCL_SET_ERROR_MSG("failed to allocate memory for output topic") + RCL_SET_ERROR_MSG("failed to allocate memory for output topic"); return RCL_RET_BAD_ALLOC; } } @@ -225,7 +225,7 @@ rcl_expand_topic_name( local_output = rcutils_strdup(input_topic_name, allocator); if (!local_output) { *output_topic_name = NULL; - RCL_SET_ERROR_MSG("failed to allocate memory for output topic") + RCL_SET_ERROR_MSG("failed to allocate memory for output topic"); return RCL_RET_BAD_ALLOC; } } @@ -237,7 +237,7 @@ rcl_expand_topic_name( rcl_ret_t rcl_get_default_topic_name_substitutions(rcutils_string_map_t * string_map) { - RCL_CHECK_ARGUMENT_FOR_NULL(string_map, RCL_RET_INVALID_ARGUMENT) + RCL_CHECK_ARGUMENT_FOR_NULL(string_map, RCL_RET_INVALID_ARGUMENT); // right now there are no default substitutions diff --git a/rcl/src/rcl/graph.c b/rcl/src/rcl/graph.c index 13aaf0d2c7..07e46bc845 100644 --- a/rcl/src/rcl/graph.c +++ b/rcl/src/rcl/graph.c @@ -36,12 +36,12 @@ rcl_get_topic_names_and_types( bool no_demangle, rcl_names_and_types_t * topic_names_and_types) { - RCL_CHECK_ARGUMENT_FOR_NULL(allocator, RCL_RET_INVALID_ARGUMENT) + RCL_CHECK_ARGUMENT_FOR_NULL(allocator, RCL_RET_INVALID_ARGUMENT); RCL_CHECK_ARGUMENT_FOR_NULL(node, RCL_RET_INVALID_ARGUMENT); if (!rcl_node_is_valid(node)) { return RCL_RET_NODE_INVALID; } - RCL_CHECK_ARGUMENT_FOR_NULL(topic_names_and_types, RCL_RET_INVALID_ARGUMENT) + RCL_CHECK_ARGUMENT_FOR_NULL(topic_names_and_types, RCL_RET_INVALID_ARGUMENT); rmw_ret_t rmw_ret; rmw_ret = rmw_names_and_types_check_zero(topic_names_and_types); if (rmw_ret != RMW_RET_OK) { @@ -119,6 +119,7 @@ rcl_get_node_names( RCL_SET_ERROR_MSG("node_namespaces is not null"); return RCL_RET_INVALID_ARGUMENT; } + (void)allocator; // to be used in rmw_get_node_names in the future rmw_ret_t rmw_ret = rmw_get_node_names( rcl_node_get_rmw_handle(node), node_names, diff --git a/rcl/src/rcl/publisher.c b/rcl/src/rcl/publisher.c index cc23e10ea0..91dfee17e1 100644 --- a/rcl/src/rcl/publisher.c +++ b/rcl/src/rcl/publisher.c @@ -77,7 +77,7 @@ rcl_publisher_init( rcutils_string_map_t substitutions_map = rcutils_get_zero_initialized_string_map(); rcutils_ret_t rcutils_ret = rcutils_string_map_init(&substitutions_map, 0, rcutils_allocator); if (rcutils_ret != RCUTILS_RET_OK) { - RCL_SET_ERROR_MSG(rcutils_get_error_string().str) + RCL_SET_ERROR_MSG(rcutils_get_error_string().str); if (rcutils_ret == RCUTILS_RET_BAD_ALLOC) { return RCL_RET_BAD_ALLOC; } @@ -151,7 +151,7 @@ rcl_publisher_init( goto cleanup; } if (validation_result != RMW_TOPIC_VALID) { - RCL_SET_ERROR_MSG(rmw_full_topic_name_validation_result_string(validation_result)) + RCL_SET_ERROR_MSG(rmw_full_topic_name_validation_result_string(validation_result)); ret = RCL_RET_TOPIC_NAME_INVALID; goto cleanup; } diff --git a/rcl/src/rcl/service.c b/rcl/src/rcl/service.c index 579da16824..4402378348 100644 --- a/rcl/src/rcl/service.c +++ b/rcl/src/rcl/service.c @@ -76,7 +76,7 @@ rcl_service_init( rcutils_string_map_t substitutions_map = rcutils_get_zero_initialized_string_map(); rcutils_ret_t rcutils_ret = rcutils_string_map_init(&substitutions_map, 0, rcutils_allocator); if (rcutils_ret != RCUTILS_RET_OK) { - RCL_SET_ERROR_MSG(rcutils_get_error_string().str) + RCL_SET_ERROR_MSG(rcutils_get_error_string().str); if (rcutils_ret == RCUTILS_RET_BAD_ALLOC) { return RCL_RET_BAD_ALLOC; } @@ -108,7 +108,7 @@ rcl_service_init( &expanded_service_name); rcutils_ret = rcutils_string_map_fini(&substitutions_map); if (rcutils_ret != RCUTILS_RET_OK) { - RCL_SET_ERROR_MSG(rcutils_get_error_string().str) + RCL_SET_ERROR_MSG(rcutils_get_error_string().str); ret = RCL_RET_ERROR; goto cleanup; return RCL_RET_ERROR; @@ -151,7 +151,7 @@ rcl_service_init( goto cleanup; } if (validation_result != RMW_TOPIC_VALID) { - RCL_SET_ERROR_MSG(rmw_full_topic_name_validation_result_string(validation_result)) + RCL_SET_ERROR_MSG(rmw_full_topic_name_validation_result_string(validation_result)); ret = RCL_RET_SERVICE_NAME_INVALID; goto cleanup; } diff --git a/rcl/src/rcl/subscription.c b/rcl/src/rcl/subscription.c index 8adadfc084..7bf61f295b 100644 --- a/rcl/src/rcl/subscription.c +++ b/rcl/src/rcl/subscription.c @@ -75,7 +75,7 @@ rcl_subscription_init( rcutils_string_map_t substitutions_map = rcutils_get_zero_initialized_string_map(); rcutils_ret_t rcutils_ret = rcutils_string_map_init(&substitutions_map, 0, rcutils_allocator); if (rcutils_ret != RCUTILS_RET_OK) { - RCL_SET_ERROR_MSG(rcutils_get_error_string().str) + RCL_SET_ERROR_MSG(rcutils_get_error_string().str); if (rcutils_ret == RCUTILS_RET_BAD_ALLOC) { return RCL_RET_BAD_ALLOC; } @@ -107,7 +107,7 @@ rcl_subscription_init( &expanded_topic_name); rcutils_ret = rcutils_string_map_fini(&substitutions_map); if (rcutils_ret != RCUTILS_RET_OK) { - RCL_SET_ERROR_MSG(rcutils_get_error_string().str) + RCL_SET_ERROR_MSG(rcutils_get_error_string().str); ret = RCL_RET_ERROR; goto cleanup; } @@ -149,7 +149,7 @@ rcl_subscription_init( goto cleanup; } if (validation_result != RMW_TOPIC_VALID) { - RCL_SET_ERROR_MSG(rmw_full_topic_name_validation_result_string(validation_result)) + RCL_SET_ERROR_MSG(rmw_full_topic_name_validation_result_string(validation_result)); ret = RCL_RET_TOPIC_NAME_INVALID; goto cleanup; } diff --git a/rcl/src/rcl/time.c b/rcl/src/rcl/time.c index 00b3b0106d..e324a17a29 100644 --- a/rcl/src/rcl/time.c +++ b/rcl/src/rcl/time.c @@ -284,12 +284,12 @@ rcl_enable_ros_time_override(rcl_clock_t * clock) { RCL_CHECK_ARGUMENT_FOR_NULL(clock, RCL_RET_INVALID_ARGUMENT); if (clock->type != RCL_ROS_TIME) { - RCL_SET_ERROR_MSG("Clock is not of type RCL_ROS_TIME, cannot enable override.") + RCL_SET_ERROR_MSG("Clock is not of type RCL_ROS_TIME, cannot enable override."); return RCL_RET_ERROR; } rcl_ros_clock_storage_t * storage = (rcl_ros_clock_storage_t *)clock->data; if (!storage) { - RCL_SET_ERROR_MSG("Clock storage is not initialized, cannot enable override.") + RCL_SET_ERROR_MSG("Clock storage is not initialized, cannot enable override."); return RCL_RET_ERROR; } if (!storage->active) { @@ -308,13 +308,13 @@ rcl_disable_ros_time_override(rcl_clock_t * clock) { RCL_CHECK_ARGUMENT_FOR_NULL(clock, RCL_RET_INVALID_ARGUMENT); if (clock->type != RCL_ROS_TIME) { - RCL_SET_ERROR_MSG("Clock is not of type RCL_ROS_TIME, cannot disable override.") + RCL_SET_ERROR_MSG("Clock is not of type RCL_ROS_TIME, cannot disable override."); return RCL_RET_ERROR; } rcl_ros_clock_storage_t * storage = \ (rcl_ros_clock_storage_t *)clock->data; if (!storage) { - RCL_SET_ERROR_MSG("Clock storage is not initialized, cannot disable override.") + RCL_SET_ERROR_MSG("Clock storage is not initialized, cannot disable override."); return RCL_RET_ERROR; } if (storage->active) { @@ -336,13 +336,13 @@ rcl_is_enabled_ros_time_override( RCL_CHECK_ARGUMENT_FOR_NULL(clock, RCL_RET_INVALID_ARGUMENT); RCL_CHECK_ARGUMENT_FOR_NULL(is_enabled, RCL_RET_INVALID_ARGUMENT); if (clock->type != RCL_ROS_TIME) { - RCL_SET_ERROR_MSG("Clock is not of type RCL_ROS_TIME, cannot query override state.") + RCL_SET_ERROR_MSG("Clock is not of type RCL_ROS_TIME, cannot query override state."); return RCL_RET_ERROR; } rcl_ros_clock_storage_t * storage = \ (rcl_ros_clock_storage_t *)clock->data; if (!storage) { - RCL_SET_ERROR_MSG("Clock storage is not initialized, cannot query override state.") + RCL_SET_ERROR_MSG("Clock storage is not initialized, cannot query override state."); return RCL_RET_ERROR; } *is_enabled = storage->active; @@ -356,7 +356,7 @@ rcl_set_ros_time_override( { RCL_CHECK_ARGUMENT_FOR_NULL(clock, RCL_RET_INVALID_ARGUMENT); if (clock->type != RCL_ROS_TIME) { - RCL_SET_ERROR_MSG("Clock is not of type RCL_ROS_TIME, cannot set time override.") + RCL_SET_ERROR_MSG("Clock is not of type RCL_ROS_TIME, cannot set time override."); return RCL_RET_ERROR; } rcl_time_jump_t time_jump; diff --git a/rcl/src/rcl/validate_topic_name.c b/rcl/src/rcl/validate_topic_name.c index 882f7df94d..671ae38b84 100644 --- a/rcl/src/rcl/validate_topic_name.c +++ b/rcl/src/rcl/validate_topic_name.c @@ -32,7 +32,7 @@ rcl_validate_topic_name( int * validation_result, size_t * invalid_index) { - RCL_CHECK_ARGUMENT_FOR_NULL(topic_name, RCL_RET_INVALID_ARGUMENT) + RCL_CHECK_ARGUMENT_FOR_NULL(topic_name, RCL_RET_INVALID_ARGUMENT); return rcl_validate_topic_name_with_size( topic_name, strlen(topic_name), validation_result, invalid_index); } @@ -44,8 +44,8 @@ rcl_validate_topic_name_with_size( int * validation_result, size_t * invalid_index) { - RCL_CHECK_ARGUMENT_FOR_NULL(topic_name, RCL_RET_INVALID_ARGUMENT) - RCL_CHECK_ARGUMENT_FOR_NULL(validation_result, RCL_RET_INVALID_ARGUMENT) + RCL_CHECK_ARGUMENT_FOR_NULL(topic_name, RCL_RET_INVALID_ARGUMENT); + RCL_CHECK_ARGUMENT_FOR_NULL(validation_result, RCL_RET_INVALID_ARGUMENT); if (topic_name_length == 0) { *validation_result = RCL_TOPIC_NAME_INVALID_IS_EMPTY_STRING; diff --git a/rcl_lifecycle/src/com_interface.c b/rcl_lifecycle/src/com_interface.c index 14df82a9e6..149f4fde74 100644 --- a/rcl_lifecycle/src/com_interface.c +++ b/rcl_lifecycle/src/com_interface.c @@ -69,14 +69,14 @@ rcl_lifecycle_com_interface_init( const rosidl_service_type_support_t * ts_srv_get_available_transitions, const rosidl_service_type_support_t * ts_srv_get_transition_graph) { - RCL_CHECK_ARGUMENT_FOR_NULL(com_interface, RCL_RET_INVALID_ARGUMENT) - RCL_CHECK_ARGUMENT_FOR_NULL(node_handle, RCL_RET_INVALID_ARGUMENT) - RCL_CHECK_ARGUMENT_FOR_NULL(ts_pub_notify, RCL_RET_INVALID_ARGUMENT) - RCL_CHECK_ARGUMENT_FOR_NULL(ts_srv_change_state, RCL_RET_INVALID_ARGUMENT) - RCL_CHECK_ARGUMENT_FOR_NULL(ts_srv_get_state, RCL_RET_INVALID_ARGUMENT) - RCL_CHECK_ARGUMENT_FOR_NULL(ts_srv_get_available_states, RCL_RET_INVALID_ARGUMENT) - RCL_CHECK_ARGUMENT_FOR_NULL(ts_srv_get_available_transitions, RCL_RET_INVALID_ARGUMENT) - RCL_CHECK_ARGUMENT_FOR_NULL(ts_srv_get_transition_graph, RCL_RET_INVALID_ARGUMENT) + RCL_CHECK_ARGUMENT_FOR_NULL(com_interface, RCL_RET_INVALID_ARGUMENT); + RCL_CHECK_ARGUMENT_FOR_NULL(node_handle, RCL_RET_INVALID_ARGUMENT); + RCL_CHECK_ARGUMENT_FOR_NULL(ts_pub_notify, RCL_RET_INVALID_ARGUMENT); + RCL_CHECK_ARGUMENT_FOR_NULL(ts_srv_change_state, RCL_RET_INVALID_ARGUMENT); + RCL_CHECK_ARGUMENT_FOR_NULL(ts_srv_get_state, RCL_RET_INVALID_ARGUMENT); + RCL_CHECK_ARGUMENT_FOR_NULL(ts_srv_get_available_states, RCL_RET_INVALID_ARGUMENT); + RCL_CHECK_ARGUMENT_FOR_NULL(ts_srv_get_available_transitions, RCL_RET_INVALID_ARGUMENT); + RCL_CHECK_ARGUMENT_FOR_NULL(ts_srv_get_transition_graph, RCL_RET_INVALID_ARGUMENT); // initialize publisher {