Skip to content
This repository has been archived by the owner on Oct 7, 2021. It is now read-only.

Commit

Permalink
Add semicolons to all RCLCPP and RCUTILS macros. (#244)
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
  • Loading branch information
clalancette authored Oct 5, 2018
1 parent e18dcf0 commit ad9c561
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions rmw_opensplice_cpp/src/demangle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ _demangle_service_from_topic(const std::string & topic_name)
if (topic_name.length() - suffix_position - suffix.length() != 0) {
RCUTILS_LOG_WARN_NAMED("rmw_opensplice_cpp",
"service topic has service prefix and a suffix, but not at the end"
", report this: '%s'", topic_name.c_str())
", report this: '%s'", topic_name.c_str());
continue;
}
found_suffix = suffix;
Expand All @@ -95,7 +95,7 @@ _demangle_service_from_topic(const std::string & topic_name)
if (suffix_position == std::string::npos) {
RCUTILS_LOG_WARN_NAMED("rmw_opensplice_cpp",
"service topic has prefix but no suffix"
", report this: '%s'", topic_name.c_str())
", report this: '%s'", topic_name.c_str());
return "";
}
// strip off the suffix first
Expand Down Expand Up @@ -126,7 +126,7 @@ _demangle_service_type_only(const std::string & dds_type_name)
if (dds_type_name.length() - suffix_position - suffix.length() != 0) {
RCUTILS_LOG_WARN_NAMED("rmw_opensplice_cpp",
"service type contains '::srv::dds_::' and a suffix, but not at the end"
", report this: '%s'", dds_type_name.c_str())
", report this: '%s'", dds_type_name.c_str());
continue;
}
found_suffix = suffix;
Expand All @@ -136,7 +136,7 @@ _demangle_service_type_only(const std::string & dds_type_name)
if (suffix_position == std::string::npos) {
RCUTILS_LOG_WARN_NAMED("rmw_opensplice_cpp",
"service type contains '::srv::dds_::' but does not have a suffix"
", report this: '%s'", dds_type_name.c_str())
", report this: '%s'", dds_type_name.c_str());
return "";
}
// everything checks out, reformat it from '<pkg>::srv::dds_::<type><suffix>' to '<pkg>/<type>'
Expand Down
8 changes: 4 additions & 4 deletions rmw_opensplice_cpp/src/rmw_node_names.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -168,28 +168,28 @@ rmw_get_node_names(
if (rcutils_ret != RCUTILS_RET_OK) {
RCUTILS_LOG_ERROR_NAMED(
"rmw_opensplice_cpp",
"failed to cleanup during error handling: %s", rcutils_get_error_string_safe())
"failed to cleanup during error handling: %s", rcutils_get_error_string_safe());
rcutils_reset_error();
}
rcutils_ret = rcutils_string_array_fini(&node_list);
if (rcutils_ret != RCUTILS_RET_OK) {
RCUTILS_LOG_ERROR_NAMED(
"rmw_opensplice_cpp",
"failed to cleanup during error handling: %s", rcutils_get_error_string_safe())
"failed to cleanup during error handling: %s", rcutils_get_error_string_safe());
rcutils_reset_error();
}
rcutils_ret = rcutils_string_array_fini(node_names);
if (rcutils_ret != RCUTILS_RET_OK) {
RCUTILS_LOG_ERROR_NAMED(
"rmw_opensplice_cpp",
"failed to cleanup during error handling: %s", rcutils_get_error_string_safe())
"failed to cleanup during error handling: %s", rcutils_get_error_string_safe());
rcutils_reset_error();
}
rcutils_ret = rcutils_string_array_fini(node_namespaces);
if (rcutils_ret != RCUTILS_RET_OK) {
RCUTILS_LOG_ERROR_NAMED(
"rmw_opensplice_cpp",
"failed to cleanup during error handling: %s", rcutils_get_error_string_safe())
"failed to cleanup during error handling: %s", rcutils_get_error_string_safe());
rcutils_reset_error();
}
return RMW_RET_BAD_ALLOC;
Expand Down
2 changes: 1 addition & 1 deletion rmw_opensplice_cpp/src/rmw_service_names_and_types.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ rmw_get_service_names_and_types(
auto fail_cleanup = [&service_names_and_types]() {
rmw_ret_t rmw_ret = rmw_names_and_types_fini(service_names_and_types);
if (rmw_ret != RMW_RET_OK) {
RCUTILS_LOG_ERROR("error during report of error: %s", rmw_get_error_string_safe())
RCUTILS_LOG_ERROR("error during report of error: %s", rmw_get_error_string_safe());
}
};
// For each service, store the name, initialize the string array for types, and store all types
Expand Down
2 changes: 1 addition & 1 deletion rmw_opensplice_cpp/src/rmw_topic_names_and_types.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ rmw_get_topic_names_and_types(
auto fail_cleanup = [&topic_names_and_types]() {
rmw_ret_t rmw_ret = rmw_names_and_types_fini(topic_names_and_types);
if (rmw_ret != RMW_RET_OK) {
RCUTILS_LOG_ERROR("error during report of error: %s", rmw_get_error_string_safe())
RCUTILS_LOG_ERROR("error during report of error: %s", rmw_get_error_string_safe());
}
};
// Setup demangling functions based on no_demangle option
Expand Down

0 comments on commit ad9c561

Please sign in to comment.