tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove c++14'isms from system_properties

Browse source 
Change-Id: If78e7d2770e8f8321f0d1824c3c52f93820dd325
This commit is contained in:
Tom Cherry 2015-12-03 15:38:52 -08:00
parent 376b94f1e7
commit 845e24a05e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libc/bionic/system_properties.cpp
View file

@ -784,7 +784,7 @@ static bool map_system_property_area(bool access_rw, bool* fsetxattr_failed) {
} }
static prop_area* get_prop_area_for_name(const char* name) { static prop_area* get_prop_area_for_name(const char* name) {
auto entry = list_find(prefixes, [name](auto l) { auto entry = list_find(prefixes, [name](prefix_node* l) {
return l->prefix[0] == '*' || !strncmp(l->prefix, name, l->prefix_len); return l->prefix[0] == '*' || !strncmp(l->prefix, name, l->prefix_len);
}); });
if (!entry) { if (!entry) {
@ -916,8 +916,8 @@ static bool initialize_properties() {
continue; continue;
} }
auto old_context = auto old_context = list_find(
list_find(contexts, [context](auto l) { return !strcmp(l->context, context); }); contexts, [context](context_node* l) { return !strcmp(l->context, context); });
if (old_context) { if (old_context) {
list_add_after_len(&prefixes, prop_prefix, old_context); list_add_after_len(&prefixes, prop_prefix, old_context);
} else { } else {
@ -981,7 +981,7 @@ int __system_property_area_init()
} }
bool open_prop_file_failed = false; bool open_prop_file_failed = false;
bool fsetxattr_failed = false; bool fsetxattr_failed = false;
list_foreach(contexts, [&fsetxattr_failed, &open_prop_file_failed](auto l) { list_foreach(contexts, [&fsetxattr_failed, &open_prop_file_failed](context_node* l) {
if (!open_prop_file(l, true, &fsetxattr_failed)) { if (!open_prop_file(l, true, &fsetxattr_failed)) {
open_prop_file_failed = true; open_prop_file_failed = true;
} }
@ -1195,7 +1195,7 @@ int __system_property_foreach(void (*propfn)(const prop_info *pi, void *cookie),
return __system_property_foreach_compat(propfn, cookie); return __system_property_foreach_compat(propfn, cookie);
} }
list_foreach(contexts, [propfn, cookie](auto l) { list_foreach(contexts, [propfn, cookie](context_node* l) {
if (!l->pa && !l->checked_access) { if (!l->pa && !l->checked_access) {
if (check_access(l)) { if (check_access(l)) {
open_prop_file(l, false, nullptr); open_prop_file(l, false, nullptr);