aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Langlois <pierre.langlois@arm.com>2015-03-09 16:57:18 +0000
committerPierre Langlois <pierre.langlois@arm.com>2016-03-04 17:48:57 +0000
commit96f8cb2119be3e86df6f62f8076bde5d8bc549e3 (patch)
treef1aac08c11c657cffa77b1997bfa75e489991a93
parent0bd39b8c787c60c89f71d832b4ed342bd2aede78 (diff)
downloadkdbinder-96f8cb2119be3e86df6f62f8076bde5d8bc549e3.tar.gz
libkdbinder: kdbus: Connection::name_list: rename the return vector of names
Change-Id: I5c850584972610b5f4ae72e7fce09d4d6f237f0a
-rw-r--r--libs/kdbinder/kdbus/connection.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/libs/kdbinder/kdbus/connection.cpp b/libs/kdbinder/kdbus/connection.cpp
index 134c7d4..50d06d9 100644
--- a/libs/kdbinder/kdbus/connection.cpp
+++ b/libs/kdbinder/kdbus/connection.cpp
@@ -116,7 +116,7 @@ const Reply Connection::release_name(const std::string& name) const {
std::vector<NameInfo> Connection::name_list(uint64_t flags) const {
struct kdbus_name_list *list;
- std::vector<NameInfo> list_vector = {};
+ std::vector<NameInfo> names = {};
auto reply = send_command_name_list(bus_file_.get(), flags);
@@ -137,34 +137,34 @@ std::vector<NameInfo> Connection::name_list(uint64_t flags) const {
}
for_each_name_info(list,
- [&list_vector, &flags](struct kdbus_name_info *name) {
+ [&names, &flags](struct kdbus_name_info *name) {
// Include IDs.
if ((flags & Unique) == Unique) {
- list_vector.emplace_back("", 0, name->conn_flags, name->owner_id);
+ names.emplace_back("", 0, name->conn_flags, name->owner_id);
}
// Include well-known names.
if ((flags & Names) == Names) {
- for_each_item(name, [&list_vector, &name](struct kdbus_item *item) {
+ for_each_item(name, [&names, &name](struct kdbus_item *item) {
if (item->type == KDBUS_ITEM_OWNED_NAME) {
- list_vector.emplace_back(item->name.name, item->name.flags,
- name->conn_flags, name->owner_id);
+ names.emplace_back(item->name.name, item->name.flags,
+ name->conn_flags, name->owner_id);
}
});
}
});
- std::ostringstream list_dump;
- for (const auto& n : list_vector) {
- list_dump << "- name: " << n.name << ", flags: " << n.flags
- << ", connection flags: " << n.connection_flags
- << ", owner ID: " << n.owner_id << "\n";
+ std::ostringstream names_dump;
+ for (const auto& n : names) {
+ names_dump << "- name: " << n.name << ", flags: " << n.flags
+ << ", connection flags: " << n.connection_flags
+ << ", owner ID: " << n.owner_id << "\n";
}
ALOGV("ID %d received the following list of names:\n%s", (int) id,
- list_dump.str().c_str());
+ names_dump.str().c_str());
- return list_vector;
+ return names;
}
const Reply Connection::queue_message(const Message& message) const {