summaryrefslogtreecommitdiffstats
path: root/libcutils
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2014-04-15 18:06:39 -0700
committerIgor Murashkin <iam@google.com>2014-04-15 18:06:39 -0700
commit8efea957beb3af682095c0bd6aa4c68ad531c7da (patch)
treee85b226dac53485b691061d31e127dbe3c3922f7 /libcutils
parent0ef87a44f8135b6802ed726ff706aaa5d7a6393d (diff)
downloadsystem_core-8efea957beb3af682095c0bd6aa4c68ad531c7da.zip
system_core-8efea957beb3af682095c0bd6aa4c68ad531c7da.tar.gz
system_core-8efea957beb3af682095c0bd6aa4c68ad531c7da.tar.bz2
libcutils: Fix warnings in properties.c when verbose logging is enabled
Change-Id: I07c5eb59b9395734ad3fc25eba753564c0f096a0
Diffstat (limited to 'libcutils')
-rw-r--r--libcutils/properties.c7
-rw-r--r--libcutils/tests/Android.mk3
2 files changed, 6 insertions, 4 deletions
diff --git a/libcutils/properties.c b/libcutils/properties.c
index bfbd1b8..b283658 100644
--- a/libcutils/properties.c
+++ b/libcutils/properties.c
@@ -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;
diff --git a/libcutils/tests/Android.mk b/libcutils/tests/Android.mk
index e9d3ed7..d3e07f8 100644
--- a/libcutils/tests/Android.mk
+++ b/libcutils/tests/Android.mk
@@ -19,7 +19,8 @@ test_src_files := \
PropertiesTest.cpp \
shared_libraries := \
- libutils
+ libutils \
+ liblog
static_libraries := \
libcutils