summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Samuel Tan <samueltan@google.com> 2015-12-17 03:03:30 +0000
committer android-build-merger <android-build-merger@google.com> 2015-12-17 03:03:30 +0000
commit2b6725e53a59ce50871405024b7086a73088721a (patch)
tree96fe0af406d9a9fbd23bd10867567a2518b230db
parent7556ad481bf1bbba2d5556f69bee9fca01c72b93 (diff)
parent656186456f2413831bc0127ac6843ca6f2d8e66e (diff)
Merge "Fix format specifiers for size_t types" am: 0d77698233
am: 656186456f * commit '656186456f2413831bc0127ac6843ca6f2d8e66e': Fix format specifiers for size_t types
-rw-r--r--libs/binder/PersistableBundle.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/binder/PersistableBundle.cpp b/libs/binder/PersistableBundle.cpp
index 47009c7051..aef791c37b 100644
--- a/libs/binder/PersistableBundle.cpp
+++ b/libs/binder/PersistableBundle.cpp
@@ -109,7 +109,7 @@ status_t PersistableBundle::writeToParcel(Parcel* parcel) const {
parcel->setDataPosition(length_pos);
size_t length = end_pos - start_pos;
if (length > std::numeric_limits<int32_t>::max()) {
- ALOGE("Parcel length (%u) too large to store in 32-bit signed int", length);
+ ALOGE("Parcel length (%zu) too large to store in 32-bit signed int", length);
return BAD_VALUE;
}
RETURN_IF_FAILED(parcel->writeInt32(static_cast<int32_t>(length)));
@@ -271,7 +271,7 @@ status_t PersistableBundle::writeToParcelInner(Parcel* parcel) const {
*/
size_t num_entries = size();
if (num_entries > std::numeric_limits<int32_t>::max()) {
- ALOGE("The size of this PersistableBundle (%u) too large to store in 32-bit signed int",
+ ALOGE("The size of this PersistableBundle (%zu) too large to store in 32-bit signed int",
num_entries);
return BAD_VALUE;
}