summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-04-30 19:00:21 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-30 19:00:21 +0000
commit0d79b935f533220613f492ab06a12f5cc9591805 (patch)
treeea60cbcafa121bc3956de87a94ddc52f05e36da0 /media
parentf612af07efe1b71903a2e3e0c4f6e38fa59a30c5 (diff)
parentb27ce2fba0049897558f1f3df9039f443ee4bc88 (diff)
downloadframeworks_av-0d79b935f533220613f492ab06a12f5cc9591805.zip
frameworks_av-0d79b935f533220613f492ab06a12f5cc9591805.tar.gz
frameworks_av-0d79b935f533220613f492ab06a12f5cc9591805.tar.bz2
am b27ce2fb: am 416685d0: Merge "Fix format warnings"
* commit 'b27ce2fba0049897558f1f3df9039f443ee4bc88': Fix format warnings
Diffstat (limited to 'media')
-rw-r--r--media/libnbaio/NBLog.cpp6
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);