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

Merge "libcutils: Fix warnings in properties.c when verbose logging is enabled"

This commit is contained in:
Igor Murashkin 2014-04-23 17:55:46 +00:00 committed by Android (Google) Code Review
parent 8f94e6204d 8efea957be
commit 70c7d5af87
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libcutils/properties.c
View File

@ -78,15 +78,16 @@ static intmax_t property_get_imax(const char *key, intmax_t lower_bound, intmax_
if ((result == INTMAX_MIN || result == INTMAX_MAX) && errno == ERANGE) {
// Over or underflow
result = default_value;
ALOGV("%s(%s,%lld) - overflow", __FUNCTION__, key, default_value);
ALOGV("%s(%s,%" PRIdMAX ") - overflow", __FUNCTION__, key, default_value);
} else if (result < lower_bound || result > upper_bound) {
// Out of range of requested bounds
result = default_value;
ALOGV("%s(%s,%lld) - out of range", __FUNCTION__, key, default_value);
ALOGV("%s(%s,%" PRIdMAX ") - out of range", __FUNCTION__, key, default_value);
} else if (end == buf) {
// Numeric conversion failed
result = default_value;
ALOGV("%s(%s,%lld) - numeric conversion failed", __FUNCTION__, key, default_value);
ALOGV("%s(%s,%" PRIdMAX ") - numeric conversion failed",
__FUNCTION__, key, default_value);
}
errno = tmp;

3
libcutils/tests/Android.mk
View File

@ -19,7 +19,8 @@ test_src_files := \
PropertiesTest.cpp \
shared_libraries := \
libutils
libutils \
liblog
static_libraries := \
libcutils