commit 2cd29e46831a9128669ae26472a0ba1553454e0a
author Elliott Hughes <enh@google.com> Fri Aug 28 22:43:23 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 28 22:43:23 2020 +0000
tree fef624b7d81e604e2469d05a7d3c03a2853c7f02
parent 00cb016d89afa752d3fdebe60f9e7e27b45da2e6
parent 760cabed2ef5f5b050a9f2eeca42b22d598eb874

FileMap::create: remove duplicate addition. am: 54794ac613

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12393457

Change-Id: Id0ff977722c484055c7a55397752ecda6f61a91f

libutils/FileMap.cpp

diff --git a/libutils/FileMap.cpp b/libutils/FileMap.cpp
index 2e19d66..f6fe03f 100644
--- a/libutils/FileMap.cpp
+++ b/libutils/FileMap.cpp
@@ -168,12 +168,6 @@
         return false;
     }
 #else // !defined(__MINGW32__)
-    int     prot, flags, adjust;
-    off64_t adjOffset;
-    size_t  adjLength;
-
-    void* ptr;
-
     assert(fd >= 0);
     assert(offset >= 0);
     assert(length > 0);
@@ -187,20 +181,19 @@
         }
     }
 
-    adjust = offset % mPageSize;
-    adjOffset = offset - adjust;
-    adjLength = length + adjust;
+    int adjust = offset % mPageSize;
+    off64_t adjOffset = offset - adjust;
+    size_t adjLength;
     if (__builtin_add_overflow(length, adjust, &adjLength)) {
         ALOGE("adjusted length overflow: length %zu adjust %d", length, adjust);
         return false;
     }
 
-    flags = MAP_SHARED;
-    prot = PROT_READ;
-    if (!readOnly)
-        prot |= PROT_WRITE;
+    int flags = MAP_SHARED;
+    int prot = PROT_READ;
+    if (!readOnly) prot |= PROT_WRITE;
 
-    ptr = mmap(NULL, adjLength, prot, flags, fd, adjOffset);
+    void* ptr = mmap(nullptr, adjLength, prot, flags, fd, adjOffset);
     if (ptr == MAP_FAILED) {
         ALOGE("mmap(%lld,%zu) failed: %s\n",
             (long long)adjOffset, adjLength, strerror(errno));