Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2da72c62 authored by Steve Block's avatar Steve Block
Browse files

Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE 

See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: Ie7704789e47b9553d02e3f6ed89c3ceab532119c
parent 958e00db

tools/zipalign/ZipEntry.cpp

+12 −12
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ status_t ZipEntry::initFromCDE(FILE* fp) 
    long posn;

    bool hasDD;



    //LOGV("initFromCDE ---\n");

    //ALOGV("initFromCDE ---\n");



    /* read the CDE */

    result = mCDE.read(fp);
@@ -280,50 +280,50 @@ void ZipEntry::setDataInfo(long uncompLen, long compLen, unsigned long crc32, 
bool ZipEntry::compareHeaders(void) const

{

    if (mCDE.mVersionToExtract != mLFH.mVersionToExtract) {

        LOGV("cmp: VersionToExtract\n");

        ALOGV("cmp: VersionToExtract\n");

        return false;

    }

    if (mCDE.mGPBitFlag != mLFH.mGPBitFlag) {

        LOGV("cmp: GPBitFlag\n");

        ALOGV("cmp: GPBitFlag\n");

        return false;

    }

    if (mCDE.mCompressionMethod != mLFH.mCompressionMethod) {

        LOGV("cmp: CompressionMethod\n");

        ALOGV("cmp: CompressionMethod\n");

        return false;

    }

    if (mCDE.mLastModFileTime != mLFH.mLastModFileTime) {

        LOGV("cmp: LastModFileTime\n");

        ALOGV("cmp: LastModFileTime\n");

        return false;

    }

    if (mCDE.mLastModFileDate != mLFH.mLastModFileDate) {

        LOGV("cmp: LastModFileDate\n");

        ALOGV("cmp: LastModFileDate\n");

        return false;

    }

    if (mCDE.mCRC32 != mLFH.mCRC32) {

        LOGV("cmp: CRC32\n");

        ALOGV("cmp: CRC32\n");

        return false;

    }

    if (mCDE.mCompressedSize != mLFH.mCompressedSize) {

        LOGV("cmp: CompressedSize\n");

        ALOGV("cmp: CompressedSize\n");

        return false;

    }

    if (mCDE.mUncompressedSize != mLFH.mUncompressedSize) {

        LOGV("cmp: UncompressedSize\n");

        ALOGV("cmp: UncompressedSize\n");

        return false;

    }

    if (mCDE.mFileNameLength != mLFH.mFileNameLength) {

        LOGV("cmp: FileNameLength\n");

        ALOGV("cmp: FileNameLength\n");

        return false;

    }

#if 0       // this seems to be used for padding, not real data

    if (mCDE.mExtraFieldLength != mLFH.mExtraFieldLength) {

        LOGV("cmp: ExtraFieldLength\n");

        ALOGV("cmp: ExtraFieldLength\n");

        return false;

    }

#endif

    if (mCDE.mFileName != NULL) {

        if (strcmp((char*) mCDE.mFileName, (char*) mLFH.mFileName) != 0) {

            LOGV("cmp: FileName\n");

            ALOGV("cmp: FileName\n");

            return false;

        }

    }

tools/zipalign/ZipFile.cpp

+6 −6
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ status_t ZipFile::readCentralDir(void) 
        if (buf[i] == 0x50 &&

            ZipEntry::getLongLE(&buf[i]) == EndOfCentralDir::kSignature)

        {

            LOGV("+++ Found EOCD at buf+%d\n", i);

            ALOGV("+++ Found EOCD at buf+%d\n", i);

            break;

        }

    }
@@ -303,7 +303,7 @@ status_t ZipFile::readCentralDir(void) 
    /*

     * Loop through and read the central dir entries.

     */

    LOGV("Scanning %d entries...\n", mEOCD.mTotalNumEntries);

    ALOGV("Scanning %d entries...\n", mEOCD.mTotalNumEntries);

    int entry;

    for (entry = 0; entry < mEOCD.mTotalNumEntries; entry++) {

        ZipEntry* pEntry = new ZipEntry;
@@ -334,7 +334,7 @@ status_t ZipFile::readCentralDir(void) 
            result = UNKNOWN_ERROR;

            goto bail;

        }

        LOGV("+++ EOCD read check passed\n");

        ALOGV("+++ EOCD read check passed\n");

    }



bail:
@@ -799,7 +799,7 @@ status_t ZipFile::compressFpToFp(FILE* dstFp, FILE* srcFp, 


        /* only read if the input buffer is empty */

        if (zstream.avail_in == 0 && !atEof) {

            LOGV("+++ reading %d bytes\n", (int)kBufSize);

            ALOGV("+++ reading %d bytes\n", (int)kBufSize);

            if (data) {

                getSize = size > kBufSize ? kBufSize : size;

                memcpy(inBuf, data, getSize);
@@ -813,7 +813,7 @@ status_t ZipFile::compressFpToFp(FILE* dstFp, FILE* srcFp, 
                }

            }

            if (getSize < kBufSize) {

                LOGV("+++  got %d bytes, EOF reached\n",

                ALOGV("+++  got %d bytes, EOF reached\n",

                    (int)getSize);

                atEof = true;

            }
@@ -840,7 +840,7 @@ status_t ZipFile::compressFpToFp(FILE* dstFp, FILE* srcFp, 
        if (zstream.avail_out == 0 ||

            (zerr == Z_STREAM_END && zstream.avail_out != (uInt) kBufSize))

        {

            LOGV("+++ writing %d bytes\n", (int) (zstream.next_out - outBuf));

            ALOGV("+++ writing %d bytes\n", (int) (zstream.next_out - outBuf));

            if (fwrite(outBuf, 1, zstream.next_out - outBuf, dstFp) !=

                (size_t)(zstream.next_out - outBuf))

            {