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

Commit 15fab1aa authored by Steve Block's avatar Steve Block
Browse files

Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE 

See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: I9281fd27af8c6ec29ebdca60b22f6c9d5ff8deed
parent aaa8f06f

tools/zipalign/ZipEntry.cpp

+20 −20
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ status_t ZipEntry::initFromCDE(FILE* fp) 
    /* read the CDE */

    result = mCDE.read(fp);

    if (result != NO_ERROR) {

        LOGD("mCDE.read failed\n");

        ALOGD("mCDE.read failed\n");

        return result;

    }
@@ -56,14 +56,14 @@ status_t ZipEntry::initFromCDE(FILE* fp) 
    /* using the info in the CDE, go load up the LFH */

    posn = ftell(fp);

    if (fseek(fp, mCDE.mLocalHeaderRelOffset, SEEK_SET) != 0) {

        LOGD("local header seek failed (%ld)\n",

        ALOGD("local header seek failed (%ld)\n",

            mCDE.mLocalHeaderRelOffset);

        return UNKNOWN_ERROR;

    }



    result = mLFH.read(fp);

    if (result != NO_ERROR) {

        LOGD("mLFH.read failed\n");

        ALOGD("mLFH.read failed\n");

        return result;

    }
@@ -81,7 +81,7 @@ status_t ZipEntry::initFromCDE(FILE* fp) 
    hasDD = (mLFH.mGPBitFlag & kUsesDataDescr) != 0;

    if (hasDD) {

        // do something clever

        //LOGD("+++ has data descriptor\n");

        //ALOGD("+++ has data descriptor\n");

    }



    /*
@@ -413,7 +413,7 @@ status_t ZipEntry::LocalFileHeader::read(FILE* fp) 
    }



    if (ZipEntry::getLongLE(&buf[0x00]) != kSignature) {

        LOGD("whoops: didn't find expected signature\n");

        ALOGD("whoops: didn't find expected signature\n");

        result = UNKNOWN_ERROR;

        goto bail;

    }
@@ -506,17 +506,17 @@ status_t ZipEntry::LocalFileHeader::write(FILE* fp) 
 */

void ZipEntry::LocalFileHeader::dump(void) const

{

    LOGD(" LocalFileHeader contents:\n");

    LOGD("  versToExt=%u gpBits=0x%04x compression=%u\n",

    ALOGD(" LocalFileHeader contents:\n");

    ALOGD("  versToExt=%u gpBits=0x%04x compression=%u\n",

        mVersionToExtract, mGPBitFlag, mCompressionMethod);

    LOGD("  modTime=0x%04x modDate=0x%04x crc32=0x%08lx\n",

    ALOGD("  modTime=0x%04x modDate=0x%04x crc32=0x%08lx\n",

        mLastModFileTime, mLastModFileDate, mCRC32);

    LOGD("  compressedSize=%lu uncompressedSize=%lu\n",

    ALOGD("  compressedSize=%lu uncompressedSize=%lu\n",

        mCompressedSize, mUncompressedSize);

    LOGD("  filenameLen=%u extraLen=%u\n",

    ALOGD("  filenameLen=%u extraLen=%u\n",

        mFileNameLength, mExtraFieldLength);

    if (mFileName != NULL)

        LOGD("  filename: '%s'\n", mFileName);

        ALOGD("  filename: '%s'\n", mFileName);

}
@@ -549,7 +549,7 @@ status_t ZipEntry::CentralDirEntry::read(FILE* fp) 
    }



    if (ZipEntry::getLongLE(&buf[0x00]) != kSignature) {

        LOGD("Whoops: didn't find expected signature\n");

        ALOGD("Whoops: didn't find expected signature\n");

        result = UNKNOWN_ERROR;

        goto bail;

    }
@@ -675,22 +675,22 @@ status_t ZipEntry::CentralDirEntry::write(FILE* fp) 
 */

void ZipEntry::CentralDirEntry::dump(void) const

{

    LOGD(" CentralDirEntry contents:\n");

    LOGD("  versMadeBy=%u versToExt=%u gpBits=0x%04x compression=%u\n",

    ALOGD(" CentralDirEntry contents:\n");

    ALOGD("  versMadeBy=%u versToExt=%u gpBits=0x%04x compression=%u\n",

        mVersionMadeBy, mVersionToExtract, mGPBitFlag, mCompressionMethod);

    LOGD("  modTime=0x%04x modDate=0x%04x crc32=0x%08lx\n",

    ALOGD("  modTime=0x%04x modDate=0x%04x crc32=0x%08lx\n",

        mLastModFileTime, mLastModFileDate, mCRC32);

    LOGD("  compressedSize=%lu uncompressedSize=%lu\n",

    ALOGD("  compressedSize=%lu uncompressedSize=%lu\n",

        mCompressedSize, mUncompressedSize);

    LOGD("  filenameLen=%u extraLen=%u commentLen=%u\n",

    ALOGD("  filenameLen=%u extraLen=%u commentLen=%u\n",

        mFileNameLength, mExtraFieldLength, mFileCommentLength);

    LOGD("  diskNumStart=%u intAttr=0x%04x extAttr=0x%08lx relOffset=%lu\n",

    ALOGD("  diskNumStart=%u intAttr=0x%04x extAttr=0x%08lx relOffset=%lu\n",

        mDiskNumberStart, mInternalAttrs, mExternalAttrs,

        mLocalHeaderRelOffset);



    if (mFileName != NULL)

        LOGD("  filename: '%s'\n", mFileName);

        ALOGD("  filename: '%s'\n", mFileName);

    if (mFileComment != NULL)

        LOGD("  comment: '%s'\n", mFileComment);

        ALOGD("  comment: '%s'\n", mFileComment);

}

tools/zipalign/ZipFile.cpp

+37 −37
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ status_t ZipFile::open(const char* zipFileName, int flags) 
        newArchive = (access(zipFileName, F_OK) != 0);

        if (!(flags & kOpenCreate) && newArchive) {

            /* not creating, must already exist */

            LOGD("File %s does not exist", zipFileName);

            ALOGD("File %s does not exist", zipFileName);

            return NAME_NOT_FOUND;

        }

    }
@@ -96,7 +96,7 @@ status_t ZipFile::open(const char* zipFileName, int flags) 
    mZipFp = fopen(zipFileName, openflags);

    if (mZipFp == NULL) {

        int err = errno;

        LOGD("fopen failed: %d\n", err);

        ALOGD("fopen failed: %d\n", err);

        return errnoToStatus(err);

    }
@@ -215,14 +215,14 @@ status_t ZipFile::readCentralDir(void) 


    /* too small to be a ZIP archive? */

    if (fileLength < EndOfCentralDir::kEOCDLen) {

        LOGD("Length is %ld -- too small\n", (long)fileLength);

        ALOGD("Length is %ld -- too small\n", (long)fileLength);

        result = INVALID_OPERATION;

        goto bail;

    }



    buf = new unsigned char[EndOfCentralDir::kMaxEOCDSearch];

    if (buf == NULL) {

        LOGD("Failure allocating %d bytes for EOCD search",

        ALOGD("Failure allocating %d bytes for EOCD search",

             EndOfCentralDir::kMaxEOCDSearch);

        result = NO_MEMORY;

        goto bail;
@@ -236,14 +236,14 @@ status_t ZipFile::readCentralDir(void) 
        readAmount = (long) fileLength;

    }

    if (fseek(mZipFp, seekStart, SEEK_SET) != 0) {

        LOGD("Failure seeking to end of zip at %ld", (long) seekStart);

        ALOGD("Failure seeking to end of zip at %ld", (long) seekStart);

        result = UNKNOWN_ERROR;

        goto bail;

    }



    /* read the last part of the file into the buffer */

    if (fread(buf, 1, readAmount, mZipFp) != (size_t) readAmount) {

        LOGD("short file? wanted %ld\n", readAmount);

        ALOGD("short file? wanted %ld\n", readAmount);

        result = UNKNOWN_ERROR;

        goto bail;

    }
@@ -258,7 +258,7 @@ status_t ZipFile::readCentralDir(void) 
        }

    }

    if (i < 0) {

        LOGD("EOCD not found, not Zip\n");

        ALOGD("EOCD not found, not Zip\n");

        result = INVALID_OPERATION;

        goto bail;

    }
@@ -266,7 +266,7 @@ status_t ZipFile::readCentralDir(void) 
    /* extract eocd values */

    result = mEOCD.readBuf(buf + i, readAmount - i);

    if (result != NO_ERROR) {

        LOGD("Failure reading %ld bytes of EOCD values", readAmount - i);

        ALOGD("Failure reading %ld bytes of EOCD values", readAmount - i);

        goto bail;

    }

    //mEOCD.dump();
@@ -274,7 +274,7 @@ status_t ZipFile::readCentralDir(void) 
    if (mEOCD.mDiskNumber != 0 || mEOCD.mDiskWithCentralDir != 0 ||

        mEOCD.mNumEntries != mEOCD.mTotalNumEntries)

    {

        LOGD("Archive spanning not supported\n");

        ALOGD("Archive spanning not supported\n");

        result = INVALID_OPERATION;

        goto bail;

    }
@@ -294,7 +294,7 @@ status_t ZipFile::readCentralDir(void) 
     * we're hoping to preserve.

     */

    if (fseek(mZipFp, mEOCD.mCentralDirOffset, SEEK_SET) != 0) {

        LOGD("Failure seeking to central dir offset %ld\n",

        ALOGD("Failure seeking to central dir offset %ld\n",

             mEOCD.mCentralDirOffset);

        result = UNKNOWN_ERROR;

        goto bail;
@@ -310,7 +310,7 @@ status_t ZipFile::readCentralDir(void) 


        result = pEntry->initFromCDE(mZipFp);

        if (result != NO_ERROR) {

            LOGD("initFromCDE failed\n");

            ALOGD("initFromCDE failed\n");

            delete pEntry;

            goto bail;

        }
@@ -325,12 +325,12 @@ status_t ZipFile::readCentralDir(void) 
    {

        unsigned char checkBuf[4];

        if (fread(checkBuf, 1, 4, mZipFp) != 4) {

            LOGD("EOCD check read failed\n");

            ALOGD("EOCD check read failed\n");

            result = INVALID_OPERATION;

            goto bail;

        }

        if (ZipEntry::getLongLE(checkBuf) != EndOfCentralDir::kSignature) {

            LOGD("EOCD read check failed\n");

            ALOGD("EOCD read check failed\n");

            result = UNKNOWN_ERROR;

            goto bail;

        }
@@ -416,7 +416,7 @@ status_t ZipFile::addCommon(const char* fileName, const void* data, size_t size, 
            bool failed = false;

            result = compressFpToFp(mZipFp, inputFp, data, size, &crc);

            if (result != NO_ERROR) {

                LOGD("compression failed, storing\n");

                ALOGD("compression failed, storing\n");

                failed = true;

            } else {

                /*
@@ -427,7 +427,7 @@ status_t ZipFile::addCommon(const char* fileName, const void* data, size_t size, 
                long src = inputFp ? ftell(inputFp) : size;

                long dst = ftell(mZipFp) - startPosn;

                if (dst + (dst / 10) > src) {

                    LOGD("insufficient compression (src=%ld dst=%ld), storing\n",

                    ALOGD("insufficient compression (src=%ld dst=%ld), storing\n",

                        src, dst);

                    failed = true;

                }
@@ -449,7 +449,7 @@ status_t ZipFile::addCommon(const char* fileName, const void* data, size_t size, 
            }

            if (result != NO_ERROR) {

                // don't need to truncate; happens in CDE rewrite

                LOGD("failed copying data in\n");

                ALOGD("failed copying data in\n");

                goto bail;

            }

        }
@@ -468,14 +468,14 @@ status_t ZipFile::addCommon(const char* fileName, const void* data, size_t size, 
        scanResult = ZipUtils::examineGzip(inputFp, &method, &uncompressedLen,

                        &compressedLen, &crc);

        if (!scanResult || method != ZipEntry::kCompressDeflated) {

            LOGD("this isn't a deflated gzip file?");

            ALOGD("this isn't a deflated gzip file?");

            result = UNKNOWN_ERROR;

            goto bail;

        }



        result = copyPartialFpToFp(mZipFp, inputFp, compressedLen, NULL);

        if (result != NO_ERROR) {

            LOGD("failed copying gzip data in\n");

            ALOGD("failed copying gzip data in\n");

            goto bail;

        }

    } else {
@@ -660,7 +660,7 @@ status_t ZipFile::copyFpToFp(FILE* dstFp, FILE* srcFp, unsigned long* pCRC32) 
        *pCRC32 = crc32(*pCRC32, tmpBuf, count);



        if (fwrite(tmpBuf, 1, count, dstFp) != count) {

            LOGD("fwrite %d bytes failed\n", (int) count);

            ALOGD("fwrite %d bytes failed\n", (int) count);

            return UNKNOWN_ERROR;

        }

    }
@@ -682,7 +682,7 @@ status_t ZipFile::copyDataToFp(FILE* dstFp, 
    if (size > 0) {

        *pCRC32 = crc32(*pCRC32, (const unsigned char*)data, size);

        if (fwrite(data, 1, size, dstFp) != size) {

            LOGD("fwrite %d bytes failed\n", (int) size);

            ALOGD("fwrite %d bytes failed\n", (int) size);

            return UNKNOWN_ERROR;

        }

    }
@@ -716,7 +716,7 @@ status_t ZipFile::copyPartialFpToFp(FILE* dstFp, FILE* srcFp, long length, 


        count = fread(tmpBuf, 1, readSize, srcFp);

        if ((long) count != readSize) {     // error or unexpected EOF

            LOGD("fread %d bytes failed\n", (int) readSize);

            ALOGD("fread %d bytes failed\n", (int) readSize);

            return UNKNOWN_ERROR;

        }
@@ -724,7 +724,7 @@ status_t ZipFile::copyPartialFpToFp(FILE* dstFp, FILE* srcFp, long length, 
            *pCRC32 = crc32(*pCRC32, tmpBuf, count);



        if (fwrite(tmpBuf, 1, count, dstFp) != count) {

            LOGD("fwrite %d bytes failed\n", (int) count);

            ALOGD("fwrite %d bytes failed\n", (int) count);

            return UNKNOWN_ERROR;

        }
@@ -783,7 +783,7 @@ status_t ZipFile::compressFpToFp(FILE* dstFp, FILE* srcFp, 
            LOGE("Installed zlib is not compatible with linked version (%s)\n",

                ZLIB_VERSION);

        } else {

            LOGD("Call to deflateInit2 failed (zerr=%d)\n", zerr);

            ALOGD("Call to deflateInit2 failed (zerr=%d)\n", zerr);

        }

        goto bail;

    }
@@ -808,7 +808,7 @@ status_t ZipFile::compressFpToFp(FILE* dstFp, FILE* srcFp, 
            } else {

                getSize = fread(inBuf, 1, kBufSize, srcFp);

                if (ferror(srcFp)) {

                    LOGD("deflate read failed (errno=%d)\n", errno);

                    ALOGD("deflate read failed (errno=%d)\n", errno);

                    goto z_bail;

                }

            }
@@ -831,7 +831,7 @@ status_t ZipFile::compressFpToFp(FILE* dstFp, FILE* srcFp, 


        zerr = deflate(&zstream, flush);

        if (zerr != Z_OK && zerr != Z_STREAM_END) {

            LOGD("zlib deflate call failed (zerr=%d)\n", zerr);

            ALOGD("zlib deflate call failed (zerr=%d)\n", zerr);

            result = UNKNOWN_ERROR;

            goto z_bail;

        }
@@ -844,7 +844,7 @@ status_t ZipFile::compressFpToFp(FILE* dstFp, FILE* srcFp, 
            if (fwrite(outBuf, 1, zstream.next_out - outBuf, dstFp) !=

                (size_t)(zstream.next_out - outBuf))

            {

                LOGD("write %d failed in deflate\n",

                ALOGD("write %d failed in deflate\n",

                    (int) (zstream.next_out - outBuf));

                goto z_bail;

            }
@@ -1061,23 +1061,23 @@ status_t ZipFile::filemove(FILE* fp, off_t dst, off_t src, size_t n) 
                getSize = n;



            if (fseek(fp, (long) src, SEEK_SET) != 0) {

                LOGD("filemove src seek %ld failed\n", (long) src);

                ALOGD("filemove src seek %ld failed\n", (long) src);

                return UNKNOWN_ERROR;

            }



            if (fread(readBuf, 1, getSize, fp) != getSize) {

                LOGD("filemove read %ld off=%ld failed\n",

                ALOGD("filemove read %ld off=%ld failed\n",

                    (long) getSize, (long) src);

                return UNKNOWN_ERROR;

            }



            if (fseek(fp, (long) dst, SEEK_SET) != 0) {

                LOGD("filemove dst seek %ld failed\n", (long) dst);

                ALOGD("filemove dst seek %ld failed\n", (long) dst);

                return UNKNOWN_ERROR;

            }



            if (fwrite(readBuf, 1, getSize, fp) != getSize) {

                LOGD("filemove write %ld off=%ld failed\n",

                ALOGD("filemove write %ld off=%ld failed\n",

                    (long) getSize, (long) dst);

                return UNKNOWN_ERROR;

            }
@@ -1104,7 +1104,7 @@ time_t ZipFile::getModTime(int fd) 
    struct stat sb;



    if (fstat(fd, &sb) < 0) {

        LOGD("HEY: fstat on fd %d failed\n", fd);

        ALOGD("HEY: fstat on fd %d failed\n", fd);

        return (time_t) -1;

    }
@@ -1129,7 +1129,7 @@ int ZipFile::getZipFd(void) const 
    int fd;

    fd = dup(fileno(mZipFp));

    if (fd < 0) {

        LOGD("didn't work, errno=%d\n", errno);

        ALOGD("didn't work, errno=%d\n", errno);

    }



    return fd;
@@ -1224,7 +1224,7 @@ status_t ZipFile::EndOfCentralDir::readBuf(const unsigned char* buf, int len) 


    if (len < kEOCDLen) {

        /* looks like ZIP file got truncated */

        LOGD(" Zip EOCD: expected >= %d bytes, found %d\n",

        ALOGD(" Zip EOCD: expected >= %d bytes, found %d\n",

            kEOCDLen, len);

        return INVALID_OPERATION;

    }
@@ -1245,7 +1245,7 @@ status_t ZipFile::EndOfCentralDir::readBuf(const unsigned char* buf, int len) 


    if (mCommentLen > 0) {

        if (kEOCDLen + mCommentLen > len) {

            LOGD("EOCD(%d) + comment(%d) exceeds len (%d)\n",

            ALOGD("EOCD(%d) + comment(%d) exceeds len (%d)\n",

                kEOCDLen, mCommentLen, len);

            return UNKNOWN_ERROR;

        }
@@ -1288,10 +1288,10 @@ status_t ZipFile::EndOfCentralDir::write(FILE* fp) 
 */

void ZipFile::EndOfCentralDir::dump(void) const

{

    LOGD(" EndOfCentralDir contents:\n");

    LOGD("  diskNum=%u diskWCD=%u numEnt=%u totalNumEnt=%u\n",

    ALOGD(" EndOfCentralDir contents:\n");

    ALOGD("  diskNum=%u diskWCD=%u numEnt=%u totalNumEnt=%u\n",

        mDiskNumber, mDiskWithCentralDir, mNumEntries, mTotalNumEntries);

    LOGD("  centDirSize=%lu centDirOff=%lu commentLen=%u\n",

    ALOGD("  centDirSize=%lu centDirOff=%lu commentLen=%u\n",

        mCentralDirSize, mCentralDirOffset, mCommentLen);

}