Support arbitrary-length properties in property_list.
Bug: http://b/33926793
Test: visual inspection
Change-Id: Ida84c3aaafa5411a9886f8d3d45679fd60ddc00d
diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index b96e3ae..1cec781 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -80,7 +80,7 @@
"ashmem-dev.c",
"klog.cpp",
"partition_utils.c",
- "properties.c",
+ "properties.cpp",
"qtaguid.c",
"trace-dev.c",
"uevent.c",
diff --git a/libcutils/properties.c b/libcutils/properties.cpp
similarity index 85%
rename from libcutils/properties.c
rename to libcutils/properties.cpp
index bdbddd0..43ad574 100644
--- a/libcutils/properties.c
+++ b/libcutils/properties.cpp
@@ -112,9 +112,7 @@
}
int property_get(const char *key, char *value, const char *default_value) {
- int len;
-
- len = __system_property_get(key, value);
+ int len = __system_property_get(key, value);
if (len > 0) {
return len;
}
@@ -126,21 +124,21 @@
return len;
}
-struct property_list_callback_data {
- void (*propfn)(const char *key, const char *value, void *cookie);
- void *cookie;
+struct callback_data {
+ void (*callback)(const char* name, const char* value, void* cookie);
+ void* cookie;
};
-static void property_list_callback(const prop_info *pi, void *cookie) {
- char name[PROP_NAME_MAX];
- char value[PROP_VALUE_MAX];
- struct property_list_callback_data *data = cookie;
-
- __system_property_read(pi, name, value);
- data->propfn(name, value, data->cookie);
+static void trampoline(void* raw_data, const char* name, const char* value) {
+ callback_data* data = reinterpret_cast<callback_data*>(raw_data);
+ data->callback(name, value, data->cookie);
}
-int property_list(void (*propfn)(const char *key, const char *value, void *cookie), void *cookie) {
- struct property_list_callback_data data = {propfn, cookie};
+static void property_list_callback(const prop_info* pi, void* data) {
+ __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);
}