Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a98256f7 authored by Mike McTernan's avatar Mike McTernan Committed by Automerger Merge Worker
Browse files

Merge "Mark the return of munmap() as unused." into main am: 71533739 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3244900



Change-Id: I7f6e76a0537355440cfbd7d71b0bf378d2d38dcb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dfe2a277 71533739

libs/binder/Parcel.cpp

+6 −2
Original line number Diff line number Diff line
@@ -1725,7 +1725,9 @@ status_t Parcel::writeBlob(size_t len, bool mutableCopy, WritableBlob* outBlob) 
                }

            }

        }

        ::munmap(ptr, len);

        if (::munmap(ptr, len) == -1) {

            ALOGW("munmap() failed: %s", strerror(errno));

        }

    }

    ::close(fd);

    return status;
@@ -3332,7 +3334,9 @@ Parcel::Blob::~Blob() { 


void Parcel::Blob::release() {

    if (mFd != -1 && mData) {

        ::munmap(mData, mSize);

        if (::munmap(mData, mSize) == -1) {

            ALOGW("munmap() failed: %s", strerror(errno));

        }

    }

    clear();

}