From 1f2ab33988f8a609df939f01f4c90f7e9da2c99e Mon Sep 17 00:00:00 2001
From: Esteve Fernandez <esteve@osrfoundation.org>
Date: Tue, 19 May 2015 16:36:17 -0700
Subject: [PATCH] Only return a single ListParametersResult

---
 rclcpp/include/rclcpp/node.hpp      | 2 +-
 rclcpp/include/rclcpp/node_impl.hpp | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/rclcpp/include/rclcpp/node.hpp b/rclcpp/include/rclcpp/node.hpp
index e12a866..3849693 100644
--- a/rclcpp/include/rclcpp/node.hpp
+++ b/rclcpp/include/rclcpp/node.hpp
@@ -163,7 +163,7 @@ public:
   const std::vector<uint8_t> get_parameter_types(
     const std::vector<std::string> & names);
 
-  const std::vector<rcl_interfaces::ListParametersResult> list_parameters(
+  const rcl_interfaces::ListParametersResult list_parameters(
     const std::vector<std::string> & prefixes, uint64_t depth);
 
 private:
diff --git a/rclcpp/include/rclcpp/node_impl.hpp b/rclcpp/include/rclcpp/node_impl.hpp
index cb84d88..3133a96 100644
--- a/rclcpp/include/rclcpp/node_impl.hpp
+++ b/rclcpp/include/rclcpp/node_impl.hpp
@@ -302,12 +302,12 @@ Node::get_parameter_types(
   return results;
 }
 
-const std::vector<rcl_interfaces::ListParametersResult>
+const rcl_interfaces::ListParametersResult
 Node::list_parameters(
   const std::vector<std::string> & prefixes, uint64_t depth)
 {
   std::lock_guard<std::mutex> lock(mutex_);
-  std::vector<rcl_interfaces::ListParametersResult> results;
+  rcl_interfaces::ListParametersResult result;
 
   // TODO: define parameter separator, use "." for now
   for (auto & kv : parameters_) {
@@ -320,7 +320,6 @@ Node::list_parameters(
       return false;
     }))
     {
-      rcl_interfaces::ListParametersResult result;
       result.parameter_names.push_back(kv.first);
       size_t last_separator = kv.first.find_last_of('.');
       std::string prefix = kv.first.substr(0, last_separator);
@@ -329,9 +328,8 @@ Node::list_parameters(
       {
         result.parameter_prefixes.push_back(prefix);
       }
-      results.push_back(result);
     }
   }
-  return results;
+  return result;
 }
 #endif /* RCLCPP_RCLCPP_NODE_IMPL_HPP_ */