summaryrefslogtreecommitdiff
path: root/libs/utils/StreamingZipInflater.cpp
diff options
context:
space:
mode:
author Jean-Baptiste Queru <jbq@google.com> 2012-01-19 17:20:58 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-01-19 17:20:58 -0800
commitfa73dc2e69ed41a372ef9aa354c7fbe168cc2f8b (patch)
tree0c840758552e65e5ed32e0f4183aa784fa3126f3 /libs/utils/StreamingZipInflater.cpp
parent949cbfce8c77c99420c5b1363b1964806e9c7b80 (diff)
parent0190e4d0b1c426acff6f209a8983f2aa1c420162 (diff)
am 97aa8ee8: Merge ee4618bc
* commit '97aa8ee81198234aedffceaf71ad216b96323393': Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
Diffstat (limited to 'libs/utils/StreamingZipInflater.cpp')
-rw-r--r--libs/utils/StreamingZipInflater.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/utils/StreamingZipInflater.cpp b/libs/utils/StreamingZipInflater.cpp
index 00498bd1fc..59a46f977c 100644
--- a/libs/utils/StreamingZipInflater.cpp
+++ b/libs/utils/StreamingZipInflater.cpp
@@ -77,7 +77,7 @@ StreamingZipInflater::~StreamingZipInflater() {
}
void StreamingZipInflater::initInflateState() {
- LOGV("Initializing inflate state");
+ ALOGV("Initializing inflate state");
memset(&mInflateState, 0, sizeof(mInflateState));
mInflateState.zalloc = Z_NULL;
@@ -152,13 +152,13 @@ ssize_t StreamingZipInflater::read(void* outBuf, size_t count) {
mInflateState.avail_out = mOutBufSize;
/*
- LOGV("Inflating to outbuf: avail_in=%u avail_out=%u next_in=%p next_out=%p",
+ ALOGV("Inflating to outbuf: avail_in=%u avail_out=%u next_in=%p next_out=%p",
mInflateState.avail_in, mInflateState.avail_out,
mInflateState.next_in, mInflateState.next_out);
*/
int result = Z_OK;
if (mStreamNeedsInit) {
- LOGV("Initializing zlib to inflate");
+ ALOGV("Initializing zlib to inflate");
result = inflateInit2(&mInflateState, -MAX_WBITS);
mStreamNeedsInit = false;
}
@@ -192,7 +192,7 @@ int StreamingZipInflater::readNextChunk() {
size_t toRead = min_of(mInBufSize, mInTotalSize - mInNextChunkOffset);
if (toRead > 0) {
ssize_t didRead = ::read(mFd, mInBuf, toRead);
- //LOGV("Reading input chunk, size %08x didread %08x", toRead, didRead);
+ //ALOGV("Reading input chunk, size %08x didread %08x", toRead, didRead);
if (didRead < 0) {
// TODO: error
LOGE("Error reading asset data");