diff options
author | Glenn Kasten <gkasten@android.com> | 2014-04-30 18:56:54 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-30 18:56:54 +0000 |
commit | b27ce2fba0049897558f1f3df9039f443ee4bc88 (patch) | |
tree | 220cb28b88ef3280ba1621193458c2ca95f69b7e /media | |
parent | 1a7be1ec9c769203e6c8e26378de0ab8e2ad493d (diff) | |
parent | 416685d0cbab40bfc48b0e787206b5d5c2e2ec25 (diff) | |
download | frameworks_av-b27ce2fba0049897558f1f3df9039f443ee4bc88.zip frameworks_av-b27ce2fba0049897558f1f3df9039f443ee4bc88.tar.gz frameworks_av-b27ce2fba0049897558f1f3df9039f443ee4bc88.tar.bz2 |
am 416685d0: Merge "Fix format warnings"
* commit '416685d0cbab40bfc48b0e787206b5d5c2e2ec25':
Fix format warnings
Diffstat (limited to 'media')
-rw-r--r-- | media/libnbaio/NBLog.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libnbaio/NBLog.cpp b/media/libnbaio/NBLog.cpp index 262ee3b..8dfb4f0 100644 --- a/media/libnbaio/NBLog.cpp +++ b/media/libnbaio/NBLog.cpp @@ -343,7 +343,7 @@ void NBLog::Reader::dump(int fd, size_t indent) String8 timestamp, body; if (i > 0) { lost += i; - body.appendFormat("warning: lost %u bytes worth of events", lost); + body.appendFormat("warning: lost %zu bytes worth of events", lost); // TODO timestamp empty here, only other choice to wait for the first timestamp event in the // log to push it out. Consider keeping the timestamp/body between calls to readAt(). dumpLine(timestamp, body); @@ -354,7 +354,7 @@ void NBLog::Reader::dump(int fd, size_t indent) maxSec /= 10; } if (maxSec >= 0) { - timestamp.appendFormat("[%*s]", width + 4, ""); + timestamp.appendFormat("[%*s]", (int) width + 4, ""); } bool deferredTimestamp = false; while (i < avail) { @@ -364,7 +364,7 @@ void NBLog::Reader::dump(int fd, size_t indent) size_t advance = length + 3; switch (event) { case EVENT_STRING: - body.appendFormat("%.*s", length, (const char *) data); + body.appendFormat("%.*s", (int) length, (const char *) data); break; case EVENT_TIMESTAMP: { // already checked that length == sizeof(struct timespec); |