diff options
author | Greg Hackmann <ghackmann@google.com> | 2013-02-12 14:41:59 -0800 |
---|---|---|
committer | Greg Hackmann <ghackmann@google.com> | 2013-06-18 16:37:54 -0700 |
commit | e7bb159d16f9e60850a3c79cc388587959015a65 (patch) | |
tree | cfb36eac9fe64690c90c5379e3d6a6cd33d863df /libcutils | |
parent | f5d79aa4bb712fa5d8bd1b838317772c63720b3f (diff) | |
download | system_core-e7bb159d16f9e60850a3c79cc388587959015a65.zip system_core-e7bb159d16f9e60850a3c79cc388587959015a65.tar.gz system_core-e7bb159d16f9e60850a3c79cc388587959015a65.tar.bz2 |
libcutils: reimplement property_list() using __system_property_foreach()
Change-Id: I273fbf7151908ee57b9b951e7d8c5f4925bbc109
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Diffstat (limited to 'libcutils')
-rw-r--r-- | libcutils/properties.c | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/libcutils/properties.c b/libcutils/properties.c index f732ec0..28d8b2f 100644 --- a/libcutils/properties.c +++ b/libcutils/properties.c @@ -52,19 +52,28 @@ int property_get(const char *key, char *value, const char *default_value) return len; } -int property_list(void (*propfn)(const char *key, const char *value, void *cookie), - void *cookie) +struct property_list_callback_data +{ + void (*propfn)(const char *key, 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]; - const prop_info *pi; - unsigned n; - - for(n = 0; (pi = __system_property_find_nth(n)); n++) { - __system_property_read(pi, name, value); - propfn(name, value, cookie); - } - return 0; + 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) +{ + struct property_list_callback_data data = { propfn, cookie }; + return __system_property_foreach(property_list_callback, &data); } #elif defined(HAVE_SYSTEM_PROPERTY_SERVER) |