ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Support arbitrary-length properties in property_list." am: c8121ba029 am: 92aab6dbd1

Browse source 
am: be34e5661d

Change-Id: Ia812b1fdb6765088f0ecaed8dc3aaf3492f78b9d
This commit is contained in:
Elliott Hughes 2017-01-27 07:45:03 +00:00 • committed by android-build-merger
commit d5df20a2f3
2 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libcutils/Android.bp
View file

@ -98,7 +98,7 @@ cc_library {
"ashmem-dev.c", "ashmem-dev.c",
"klog.cpp", "klog.cpp",
"partition_utils.c", "partition_utils.c",
"properties.c", "properties.cpp",
"qtaguid.c", "qtaguid.c",
"trace-dev.c", "trace-dev.c",
"uevent.c", "uevent.c",

28
libcutils/properties.c → libcutils/properties.cpp
View file

@ -112,9 +112,7 @@ int property_set(const char *key, const char *value) {
} }
int property_get(const char *key, char *value, const char *default_value) { int property_get(const char *key, char *value, const char *default_value) {
int len; int len = __system_property_get(key, value);
len = __system_property_get(key, value);
if (len > 0) { if (len > 0) {
return len; return len;
} }
@ -126,21 +124,21 @@ int property_get(const char *key, char *value, const char *default_value) {
return len; return len;
} }
struct property_list_callback_data { struct callback_data {
void (*propfn)(const char *key, const char *value, void *cookie); void (*callback)(const char* name, const char* value, void* cookie);
void *cookie; void* cookie;
}; };
static void property_list_callback(const prop_info *pi, void *cookie) { static void trampoline(void* raw_data, const char* name, const char* value) {
char name[PROP_NAME_MAX]; callback_data* data = reinterpret_cast<callback_data*>(raw_data);
char value[PROP_VALUE_MAX]; data->callback(name, value, data->cookie);
struct property_list_callback_data *data = cookie;
__system_property_read(pi, name, value);
data->propfn(name, value, data->cookie);
} }
int property_list(void (*propfn)(const char *key, const char *value, void *cookie), void *cookie) { static void property_list_callback(const prop_info* pi, void* data) {
struct property_list_callback_data data = {propfn, cookie}; __system_property_read_callback(pi, trampoline, data);
}
int property_list(void (*fn)(const char* name, const char* value, void* cookie), void* cookie) {
callback_data data = { fn, cookie };
return __system_property_foreach(property_list_callback, &data); return __system_property_foreach(property_list_callback, &data);
} }