diff options
author | Elliott Hughes <enh@google.com> | 2020-08-28 23:11:38 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-28 23:11:38 +0000 |
commit | a6d7150812148a4fefd6e26ba78fe263113aeb5c (patch) | |
tree | fa6cbb90b6fb9c5e702eb40014eaac3b805d7e0d | |
parent | dc99a094dd86393e2794cddd7e33f9db70082f71 (diff) | |
parent | 98e213207fce37d5096452eda6f104d2eb61df37 (diff) | |
download | core-a6d7150812148a4fefd6e26ba78fe263113aeb5c.tar.gz |
FileMap::create: remove duplicate addition. am: 54794ac613 am: 2912d9c190 am: 98e213207f
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12393457
Change-Id: I8aeee458349a540c6a75fce57fd4a1d8b5b75eb3
-rw-r--r-- | libutils/FileMap.cpp | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/libutils/FileMap.cpp b/libutils/FileMap.cpp index 2e19d66e1..f6fe03f78 100644 --- a/libutils/FileMap.cpp +++ b/libutils/FileMap.cpp @@ -168,12 +168,6 @@ bool FileMap::create(const char* origFileName, int fd, off64_t offset, size_t le 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 @@ bool FileMap::create(const char* origFileName, int fd, off64_t offset, size_t le } } - 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)); |