commit b4814708b5def3fb7d4deccc8816a6743b7e6b6c
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 14 17:16:43 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 14 17:16:43 2021 +0000
tree 0d5e1ec5f349a0991e70a370472d1761f318235b
parent c3fc0a06e39994d1f5cacbff66d192c1d0831921
parent c13f049bcd4ec16949be3c8df0a5ff57d2037ca6

Merge "Zipalign: Remove unused variables" am: c13f049bcd

Original change: https://android-review.googlesource.com/c/platform/build/+/1825936

Change-Id: I347fe33edae5cd5a055119c70532a3e78ebc12ff

tools/zipalign/ZipFile.cpp

diff --git a/tools/zipalign/ZipFile.cpp b/tools/zipalign/ZipFile.cpp
index 1e3c413..6037d59 100644
--- a/tools/zipalign/ZipFile.cpp
+++ b/tools/zipalign/ZipFile.cpp
@@ -654,7 +654,7 @@
 {
     ZipEntry* pEntry = NULL;
     status_t result;
-    long lfhPosn, startPosn, endPosn, uncompressedLen;
+    long lfhPosn, uncompressedLen;
 
     if (mReadOnly)
         return INVALID_OPERATION;
@@ -690,7 +690,6 @@
      */
     lfhPosn = ftell(mZipFp);
     pEntry->mLFH.write(mZipFp);
-    startPosn = ftell(mZipFp);
 
     /*
      * Copy the data over.
@@ -741,18 +740,13 @@
     }
 
     /*
-     * Update file offsets.
-     */
-    endPosn = ftell(mZipFp);
-
-    /*
      * Success!  Fill out new values.
      */
     pEntry->setLFHOffset(lfhPosn);
     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.