diff options
| author | Elliott Hughes <enh@google.com> | 2020-08-28 22:43:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-28 22:43:23 +0000 |
| commit | 2912d9c190cb3b55b12b20bb487565a9b6d8b1f9 (patch) | |
| tree | fef624b7d81e604e2469d05a7d3c03a2853c7f02 | |
| parent | d8801aaad8683374298bc119480a292978dda680 (diff) | |
| parent | 54794ac613d50bf4072174476f60527e2b0b4cdf (diff) | |
| download | core-2912d9c190cb3b55b12b20bb487565a9b6d8b1f9.tar.gz | |
FileMap::create: remove duplicate addition. am: 54794ac613
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12393457
Change-Id: Id0ff977722c484055c7a55397752ecda6f61a91f
| -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)); |