Address peer review comments.

Signed-off-by: Michel Hidalgo <michel@ekumenlabs.com>
ros2 · Aug 20, 2019 · ac845e9 · ac845e9
1 parent 37e1569
commit ac845e9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/rcl/include/rcl/arguments.h b/rcl/include/rcl/arguments.h
@@ -268,7 +268,6 @@ rcl_arguments_get_param_files(
  * Lock-Free          | Yes
  *
  * \param[in] arguments An arguments structure that has been parsed.
- * \param[in] allocator A valid allocator.
  * \param[out] parameter_overrides Zero or more parameter overrides.
  *   This structure must be finalized by the caller.
  * \return `RCL_RET_OK` if everything goes correctly, or

diff --git a/rcl/test/rcl/test_arguments.cpp b/rcl/test/rcl/test_arguments.cpp
@@ -15,9 +15,10 @@
 #include <gtest/gtest.h>
 #include <sstream>
 
+#include "osrf_testing_tools_cpp/scope_exit.hpp"
+
 #include "rcl/rcl.h"
 #include "rcl/arguments.h"
-
 #include "rcl/error_handling.h"
 
 #include "rcl_yaml_param_parser/parser.h"
@@ -606,10 +607,16 @@ TEST_F(CLASSNAME(TestArgumentsFixture, RMW_IMPLEMENTATION), test_two_param_overr
 
   rcl_ret_t ret = rcl_parse_arguments(argc, argv, alloc, &parsed_args);
   ASSERT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str;
+  OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
+    EXPECT_EQ(RCL_RET_OK, rcl_arguments_fini(&parsed_args));
+  });
 
   rcl_params_t * params = NULL;
   ret = rcl_arguments_get_param_overrides(&parsed_args, &params);
   EXPECT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str;
+  OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
+    rcl_yaml_node_struct_fini(params);
+  });
   EXPECT_EQ(2U, params->num_nodes);
 
   rcl_variant_t * param_value =
@@ -622,8 +629,4 @@ TEST_F(CLASSNAME(TestArgumentsFixture, RMW_IMPLEMENTATION), test_two_param_overr
   ASSERT_TRUE(NULL != param_value);
   ASSERT_TRUE(NULL != param_value->integer_value);
   EXPECT_EQ(4, *(param_value->integer_value));
-
-  rcl_yaml_node_struct_fini(params);
-
-  EXPECT_EQ(RCL_RET_OK, rcl_arguments_fini(&parsed_args));
 }
diff --git a/rcl_yaml_param_parser/src/parser.c b/rcl_yaml_param_parser/src/parser.c
@@ -410,7 +410,7 @@ rcl_params_t * rcl_yaml_node_struct_copy(
   }
 
   rcutils_ret_t ret;
-  for (size_t node_idx = 0U; node_idx < params_st->num_nodes; node_idx++) {
+  for (size_t node_idx = 0U; node_idx < params_st->num_nodes; ++node_idx) {
     out_params_st->node_names[node_idx] =
       rcutils_strdup(params_st->node_names[node_idx], allocator);
     if (NULL == out_params_st->node_names[node_idx]) {
@@ -428,7 +428,7 @@ rcl_params_t * rcl_yaml_node_struct_copy(
       }
       goto fail;
     }
-    for (size_t parameter_idx = 0U; parameter_idx < node_params_st->num_params; parameter_idx++) {
+    for (size_t parameter_idx = 0U; parameter_idx < node_params_st->num_params; ++parameter_idx) {
       out_node_params_st->parameter_names[parameter_idx] =
         rcutils_strdup(node_params_st->parameter_names[parameter_idx], allocator);
       if (NULL == out_node_params_st->parameter_names[parameter_idx]) {