diff options
| author | 2020-07-08 16:52:14 +0000 | |
|---|---|---|
| committer | 2020-07-08 16:52:14 +0000 | |
| commit | 27174df9cc1e06fe062b6071384629d0c8a1b7a3 (patch) | |
| tree | fa66b56bdeb36355a1c7aa6c8f35e216e263471b | |
| parent | bbe3d226f5254fb7707a3b9d2a8ddc86a3a9c1a6 (diff) | |
| parent | e5d85962e3310171863e8ca2f5838880e3cc3342 (diff) | |
Merge "fix integer promotion in logging."
| -rw-r--r-- | libs/binder/MemoryDealer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/binder/MemoryDealer.cpp b/libs/binder/MemoryDealer.cpp index ebf91f925e..b46b3e88fc 100644 --- a/libs/binder/MemoryDealer.cpp +++ b/libs/binder/MemoryDealer.cpp @@ -387,7 +387,7 @@ SimpleBestFitAllocator::chunk_t* SimpleBestFitAllocator::dealloc(size_t start) while (cur) { if (cur->start == start) { LOG_FATAL_IF(cur->free, - "block at offset 0x%08lX of size 0x%08lX already freed", + "block at offset 0x%08lX of size 0x%08X already freed", cur->start*kMemoryAlign, cur->size*kMemoryAlign); // merge freed blocks together @@ -411,7 +411,7 @@ SimpleBestFitAllocator::chunk_t* SimpleBestFitAllocator::dealloc(size_t start) } #endif LOG_FATAL_IF(!freed->free, - "freed block at offset 0x%08lX of size 0x%08lX is not free!", + "freed block at offset 0x%08lX of size 0x%08X is not free!", freed->start * kMemoryAlign, freed->size * kMemoryAlign); return freed; |