diff options
author | 2012-01-09 10:13:41 -0800 | |
---|---|---|
committer | 2012-01-09 10:13:41 -0800 | |
commit | 08289f55eae5c4127091360e862f78d57ae24c15 (patch) | |
tree | 4bc65b61ad79f1a6326aff3d501056a57695fa4b /libs/utils/BlobCache.cpp | |
parent | c0c3025cf2b887b4eb7020c1b7e6f0db69a51aef (diff) | |
parent | 3762c311729fe9f3af085c14c5c1fb471d994c03 (diff) |
Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE"
Diffstat (limited to 'libs/utils/BlobCache.cpp')
-rw-r--r-- | libs/utils/BlobCache.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libs/utils/BlobCache.cpp b/libs/utils/BlobCache.cpp index 0011d29d237e..e52cf2f84539 100644 --- a/libs/utils/BlobCache.cpp +++ b/libs/utils/BlobCache.cpp @@ -183,13 +183,13 @@ size_t BlobCache::getFdCount() const { status_t BlobCache::flatten(void* buffer, size_t size, int fds[], size_t count) const { if (count != 0) { - LOGE("flatten: nonzero fd count: %d", count); + ALOGE("flatten: nonzero fd count: %d", count); return BAD_VALUE; } // Write the cache header if (size < sizeof(Header)) { - LOGE("flatten: not enough room for cache header"); + ALOGE("flatten: not enough room for cache header"); return BAD_VALUE; } Header* header = reinterpret_cast<Header*>(buffer); @@ -210,7 +210,7 @@ status_t BlobCache::flatten(void* buffer, size_t size, int fds[], size_t count) size_t entrySize = sizeof(EntryHeader) + keySize + valueSize; if (byteOffset + entrySize > size) { - LOGE("flatten: not enough room for cache entries"); + ALOGE("flatten: not enough room for cache entries"); return BAD_VALUE; } @@ -234,18 +234,18 @@ status_t BlobCache::unflatten(void const* buffer, size_t size, int fds[], mCacheEntries.clear(); if (count != 0) { - LOGE("unflatten: nonzero fd count: %d", count); + ALOGE("unflatten: nonzero fd count: %d", count); return BAD_VALUE; } // Read the cache header if (size < sizeof(Header)) { - LOGE("unflatten: not enough room for cache header"); + ALOGE("unflatten: not enough room for cache header"); return BAD_VALUE; } const Header* header = reinterpret_cast<const Header*>(buffer); if (header->mMagicNumber != blobCacheMagic) { - LOGE("unflatten: bad magic number: %d", header->mMagicNumber); + ALOGE("unflatten: bad magic number: %d", header->mMagicNumber); return BAD_VALUE; } if (header->mBlobCacheVersion != blobCacheVersion || @@ -261,7 +261,7 @@ status_t BlobCache::unflatten(void const* buffer, size_t size, int fds[], for (size_t i = 0; i < numEntries; i++) { if (byteOffset + sizeof(EntryHeader) > size) { mCacheEntries.clear(); - LOGE("unflatten: not enough room for cache entry headers"); + ALOGE("unflatten: not enough room for cache entry headers"); return BAD_VALUE; } @@ -273,7 +273,7 @@ status_t BlobCache::unflatten(void const* buffer, size_t size, int fds[], if (byteOffset + entrySize > size) { mCacheEntries.clear(); - LOGE("unflatten: not enough room for cache entry headers"); + ALOGE("unflatten: not enough room for cache entry headers"); return BAD_VALUE; } |