ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "resolved conflicts for merge of e2aa0490 to master"

Browse Source
This commit is contained in:
Dianne Hackborn 2011-06-09 18:00:12 -07:00 committed by Android (Google) Code Review
commit cbbd63fafb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/utils/StreamingZipInflater.cpp
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#define LOG_NDEBUG 1 //#define LOG_NDEBUG 0
#define LOG_TAG "szipinf" #define LOG_TAG "szipinf"
#include <utils/Log.h> #include <utils/Log.h>
@ -77,7 +77,7 @@ StreamingZipInflater::~StreamingZipInflater() {
} }
void StreamingZipInflater::initInflateState() { void StreamingZipInflater::initInflateState() {
LOGD("Initializing inflate state"); LOGV("Initializing inflate state");
memset(&mInflateState, 0, sizeof(mInflateState)); memset(&mInflateState, 0, sizeof(mInflateState));
mInflateState.zalloc = Z_NULL; mInflateState.zalloc = Z_NULL;
@ -152,13 +152,13 @@ ssize_t StreamingZipInflater::read(void* outBuf, size_t count) {
mInflateState.avail_out = mOutBufSize; mInflateState.avail_out = mOutBufSize;
/* /*
LOGD("Inflating to outbuf: avail_in=%u avail_out=%u next_in=%p next_out=%p", LOGV("Inflating to outbuf: avail_in=%u avail_out=%u next_in=%p next_out=%p",
mInflateState.avail_in, mInflateState.avail_out, mInflateState.avail_in, mInflateState.avail_out,
mInflateState.next_in, mInflateState.next_out); mInflateState.next_in, mInflateState.next_out);
*/ */
int result = Z_OK; int result = Z_OK;
if (mStreamNeedsInit) { if (mStreamNeedsInit) {
LOGD("Initializing zlib to inflate"); LOGV("Initializing zlib to inflate");
result = inflateInit2(&mInflateState, -MAX_WBITS); result = inflateInit2(&mInflateState, -MAX_WBITS);
mStreamNeedsInit = false; mStreamNeedsInit = false;
} }
@ -192,7 +192,7 @@ int StreamingZipInflater::readNextChunk() {
size_t toRead = min_of(mInBufSize, mInTotalSize - mInNextChunkOffset); size_t toRead = min_of(mInBufSize, mInTotalSize - mInNextChunkOffset);
if (toRead > 0) { if (toRead > 0) {
ssize_t didRead = ::read(mFd, mInBuf, toRead); ssize_t didRead = ::read(mFd, mInBuf, toRead);
//LOGD("Reading input chunk, size %08x didread %08x", toRead, didRead); //LOGV("Reading input chunk, size %08x didread %08x", toRead, didRead);
if (didRead < 0) { if (didRead < 0) {
// TODO: error // TODO: error
LOGE("Error reading asset data"); LOGE("Error reading asset data");