Merge "Zipalign: Remove unused variables" (c13f049b) · Commits · e / os / android_build

tools/zipalign/ZipFile.cpp

+2 −8

Original line number	Diff line number	Diff line
		@@ -654,7 +654,7 @@ status_t ZipFile::addRecompress(const ZipFile* pSourceZip, const ZipEntry* pSour
		{
		ZipEntry* pEntry = NULL;
		status_t result;
		long lfhPosn, startPosn, endPosn, uncompressedLen;
		long lfhPosn, uncompressedLen;

		if (mReadOnly)
		return INVALID_OPERATION;
		@@ -690,7 +690,6 @@ status_t ZipFile::addRecompress(const ZipFile* pSourceZip, const ZipEntry* pSour
		*/
		lfhPosn = ftell(mZipFp);
		pEntry->mLFH.write(mZipFp);
		startPosn = ftell(mZipFp);

		/*
		* Copy the data over.
		@@ -740,11 +739,6 @@ status_t ZipFile::addRecompress(const ZipFile* pSourceZip, const ZipEntry* pSour
		}
		}

		/*
		* Update file offsets.
		*/
		endPosn = ftell(mZipFp);

		/*
		* Success! Fill out new values.
		*/
		@@ -752,7 +746,7 @@ status_t ZipFile::addRecompress(const ZipFile* pSourceZip, const ZipEntry* pSour
		mEOCD.mNumEntries++;
		mEOCD.mTotalNumEntries++;
		mEOCD.mCentralDirSize = 0; // mark invalid; set by flush()
		mEOCD.mCentralDirOffset = endPosn;
		mEOCD.mCentralDirOffset = ftell(mZipFp);

		/*
		* Go back and write the LFH.