openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use clang-format to fix up properties.c 

BasedOnStyle: Google
IndentWidth: 4
ColumnLimit: 100

Test: unit tests pass
Change-Id: Ie1a9bf85c001ef1a2dcdafdc5bf696b9267116f7
This commit is contained in:
Myles Watson 2016-12-20 06:47:36 -08:00
parent 1d5965e40f
commit 22c0962ab9
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libcutils/properties.c
View File

@ -36,7 +36,7 @@ int8_t property_get_bool(const char *key, int8_t default_value) {
}
int8_t result = default_value;
char buf[PROPERTY_VALUE_MAX] = {'\0',};
char buf[PROPERTY_VALUE_MAX] = {'\0'};
int len = property_get(key, buf, "");
if (len == 1) {
@ -47,7 +47,7 @@ int8_t property_get_bool(const char *key, int8_t default_value) {
result = true;
}
} else if (len > 1) {
if (!strcmp(buf, "no") || !strcmp(buf, "false") || !strcmp(buf, "off")) {
if (!strcmp(buf, "no") || !strcmp(buf, "false") || !strcmp(buf, "off")) {
result = false;
} else if (!strcmp(buf, "yes") || !strcmp(buf, "true") || !strcmp(buf, "on")) {
result = true;
@ -59,13 +59,13 @@ int8_t property_get_bool(const char *key, int8_t default_value) {
// Convert string property to int (default if fails); return default value if out of bounds
static intmax_t property_get_imax(const char *key, intmax_t lower_bound, intmax_t upper_bound,
intmax_t default_value) {
intmax_t default_value) {
if (!key) {
return default_value;
}
intmax_t result = default_value;
char buf[PROPERTY_VALUE_MAX] = {'\0',};
char buf[PROPERTY_VALUE_MAX] = {'\0'};
char *end = NULL;
int len = property_get(key, buf, "");
@ -74,7 +74,7 @@ static intmax_t property_get_imax(const char *key, intmax_t lower_bound, intmax_
errno = 0;
// Infer base automatically
result = strtoimax(buf, &end, /*base*/0);
result = strtoimax(buf, &end, /*base*/ 0);
if ((result == INTMAX_MIN || result == INTMAX_MAX) && errno == ERANGE) {
// Over or underflow
result = default_value;
@ -86,8 +86,8 @@ static intmax_t property_get_imax(const char *key, intmax_t lower_bound, intmax_
} else if (end == buf) {
// Numeric conversion failed
result = default_value;
ALOGV("%s(%s,%" PRIdMAX ") - numeric conversion failed",
__FUNCTION__, key, default_value);
ALOGV("%s(%s,%" PRIdMAX ") - numeric conversion failed", __FUNCTION__, key,
default_value);
}
errno = tmp;
@ -107,20 +107,18 @@ int32_t property_get_int32(const char *key, int32_t default_value) {
#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
#include <sys/_system_properties.h>
int property_set(const char *key, const char *value)
{
int property_set(const char *key, const char *value) {
return __system_property_set(key, 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;
len = __system_property_get(key, value);
if(len > 0) {
if (len > 0) {
return len;
}
if(default_value) {
if (default_value) {
len = strlen(default_value);
if (len >= PROPERTY_VALUE_MAX) {
len = PROPERTY_VALUE_MAX - 1;
@ -131,14 +129,12 @@ int property_get(const char *key, char *value, const char *default_value)
return len;
}
struct property_list_callback_data
{
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)
{
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;
@ -147,10 +143,7 @@ static void property_list_callback(const prop_info *pi, void *cookie)
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 };
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);
}