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

Commit 6f4f3ab3 authored by Colin Cross's avatar Colin Cross
Browse files

binder: fix all warnings 

Fix warnings related to casting pointers to ints, using %d or %ld to
print size_t/ssize_t, and unused parameters.

Change-Id: I7a13ba83d402952989c1f795cd9e880a95b98d9e
parent 055dac1b

libs/binder/Binder.cpp

+9 −8
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ IBinder::~IBinder() 


// ---------------------------------------------------------------------------



sp<IInterface>  IBinder::queryLocalInterface(const String16& descriptor)

sp<IInterface>  IBinder::queryLocalInterface(const String16& /*descriptor*/)

{

    return NULL;

}
@@ -117,19 +117,20 @@ status_t BBinder::transact( 
}



status_t BBinder::linkToDeath(

    const sp<DeathRecipient>& recipient, void* cookie, uint32_t flags)

    const sp<DeathRecipient>& /*recipient*/, void* /*cookie*/,

    uint32_t /*flags*/)

{

    return INVALID_OPERATION;

}



status_t BBinder::unlinkToDeath(

    const wp<DeathRecipient>& recipient, void* cookie, uint32_t flags,

    wp<DeathRecipient>* outRecipient)

    const wp<DeathRecipient>& /*recipient*/, void* /*cookie*/,

    uint32_t /*flags*/, wp<DeathRecipient>* /*outRecipient*/)

{

    return INVALID_OPERATION;

}



status_t BBinder::dump(int fd, const Vector<String16>& args)

    status_t BBinder::dump(int /*fd*/, const Vector<String16>& /*args*/)

{

    return NO_ERROR;

}
@@ -189,7 +190,7 @@ BBinder::~BBinder() 




status_t BBinder::onTransact(

    uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags)

    uint32_t code, const Parcel& data, Parcel* reply, uint32_t /*flags*/)

{

    switch (code) {

        case INTERFACE_TRANSACTION:
@@ -251,14 +252,14 @@ void BpRefBase::onFirstRef() 
    android_atomic_or(kRemoteAcquired, &mState);

}



void BpRefBase::onLastStrongRef(const void* id)

void BpRefBase::onLastStrongRef(const void* /*id*/)

{

    if (mRemote) {

        mRemote->decStrong(this);

    }

}



bool BpRefBase::onIncStrongAttempted(uint32_t flags, const void* id)

bool BpRefBase::onIncStrongAttempted(uint32_t /*flags*/, const void* /*id*/)

{

    return mRemote ? mRefs->attemptIncStrong(this) : false;

}

libs/binder/BpBinder.cpp

+2 −2
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ void BpBinder::onFirstRef() 
    if (ipc) ipc->incStrongHandle(mHandle);

}



void BpBinder::onLastStrongRef(const void* id)

void BpBinder::onLastStrongRef(const void* /*id*/)

{

    ALOGV("onLastStrongRef BpBinder %p handle %d\n", this, mHandle);

    IF_ALOGV() {
@@ -353,7 +353,7 @@ void BpBinder::onLastStrongRef(const void* id) 
    if (ipc) ipc->decStrongHandle(mHandle);

}



bool BpBinder::onIncStrongAttempted(uint32_t flags, const void* id)

bool BpBinder::onIncStrongAttempted(uint32_t /*flags*/, const void* /*id*/)

{

    ALOGV("onIncStrongAttempted BpBinder %p handle %d\n", this, mHandle);

    IPCThreadState* ipc = IPCThreadState::self();

libs/binder/Debug.cpp

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ const char* stringForIndent(int32_t indentLevel) 


// ---------------------------------------------------------------------



static void defaultPrintFunc(void* cookie, const char* txt)

static void defaultPrintFunc(void* /*cookie*/, const char* txt)

{

    printf("%s", txt);

}

libs/binder/IMemory.cpp

+7 −7
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ BpMemoryHeap::~BpMemoryHeap() { 
                sp<IBinder> binder = const_cast<BpMemoryHeap*>(this)->asBinder();



                if (VERBOSE) {

                    ALOGD("UNMAPPING binder=%p, heap=%p, size=%d, fd=%d",

                    ALOGD("UNMAPPING binder=%p, heap=%p, size=%zu, fd=%d",

                            binder.get(), this, mSize, mHeapId);

                    CallStack stack(LOG_TAG);

                }
@@ -296,11 +296,11 @@ void BpMemoryHeap::assertReallyMapped() const 
        uint32_t flags = reply.readInt32();

        uint32_t offset = reply.readInt32();



        ALOGE_IF(err, "binder=%p transaction failed fd=%d, size=%ld, err=%d (%s)",

        ALOGE_IF(err, "binder=%p transaction failed fd=%d, size=%zd, err=%d (%s)",

                asBinder().get(), parcel_fd, size, err, strerror(-err));



        int fd = dup( parcel_fd );

        ALOGE_IF(fd==-1, "cannot dup fd=%d, size=%ld, err=%d (%s)",

        ALOGE_IF(fd==-1, "cannot dup fd=%d, size=%zd, err=%d (%s)",

                parcel_fd, size, err, strerror(errno));



        int access = PROT_READ;
@@ -313,7 +313,7 @@ void BpMemoryHeap::assertReallyMapped() const 
            mRealHeap = true;

            mBase = mmap(0, size, access, MAP_SHARED, fd, offset);

            if (mBase == MAP_FAILED) {

                ALOGE("cannot map BpMemoryHeap (binder=%p), size=%ld, fd=%d (%s)",

                ALOGE("cannot map BpMemoryHeap (binder=%p), size=%zd, fd=%d (%s)",

                        asBinder().get(), size, fd, strerror(errno));

                close(fd);

            } else {
@@ -402,7 +402,7 @@ sp<IMemoryHeap> HeapCache::find_heap(const sp<IBinder>& binder) 
    if (i>=0) {

        heap_info_t& info = mHeapCache.editValueAt(i);

        ALOGD_IF(VERBOSE,

                "found binder=%p, heap=%p, size=%d, fd=%d, count=%d",

                "found binder=%p, heap=%p, size=%zu, fd=%d, count=%d",

                binder.get(), info.heap.get(),

                static_cast<BpMemoryHeap*>(info.heap.get())->mSize,

                static_cast<BpMemoryHeap*>(info.heap.get())->mHeapId,
@@ -435,7 +435,7 @@ void HeapCache::free_heap(const wp<IBinder>& binder) 
            int32_t c = android_atomic_dec(&info.count);

            if (c == 1) {

                ALOGD_IF(VERBOSE,

                        "removing binder=%p, heap=%p, size=%d, fd=%d, count=%d",

                        "removing binder=%p, heap=%p, size=%zu, fd=%d, count=%d",

                        binder.unsafe_get(), info.heap.get(),

                        static_cast<BpMemoryHeap*>(info.heap.get())->mSize,

                        static_cast<BpMemoryHeap*>(info.heap.get())->mHeapId,
@@ -466,7 +466,7 @@ void HeapCache::dump_heaps() 
    for (int i=0 ; i<c ; i++) {

        const heap_info_t& info = mHeapCache.valueAt(i);

        BpMemoryHeap const* h(static_cast<BpMemoryHeap const *>(info.heap.get()));

        ALOGD("hey=%p, heap=%p, count=%d, (fd=%d, base=%p, size=%d)",

        ALOGD("hey=%p, heap=%p, count=%d, (fd=%d, base=%p, size=%zu)",

                mHeapCache.keyAt(i).unsafe_get(),

                info.heap.get(), info.count,

                h->mHeapId, h->mBase, h->mSize);

libs/binder/IPCThreadState.cpp

+6 −5
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ status_t IPCThreadState::handlePolledCommands() 
    return result;

}



void IPCThreadState::stopProcess(bool immediate)

void IPCThreadState::stopProcess(bool /*immediate*/)

{

    //ALOGI("**** STOPPING PROCESS");

    flushCommands();
@@ -861,7 +861,7 @@ status_t IPCThreadState::talkWithDriver(bool doReceive) 
    } while (err == -EINTR);



    IF_LOG_COMMANDS() {

        alog << "Our err: " << (void*)err << ", write consumed: "

        alog << "Our err: " << (void*)(intptr_t)err << ", write consumed: "

            << bwr.write_consumed << " (of " << mOut.dataSize()

                        << "), read consumed: " << bwr.read_consumed << endl;

    }
@@ -1154,9 +1154,10 @@ void IPCThreadState::threadDestructor(void *st) 
}





void IPCThreadState::freeBuffer(Parcel* parcel, const uint8_t* data, size_t dataSize,

                                const binder_size_t* objects, size_t objectsSize,

                                void* cookie)

void IPCThreadState::freeBuffer(Parcel* parcel, const uint8_t* data,

                                size_t /*dataSize*/,

                                const binder_size_t* /*objects*/,

                                size_t /*objectsSize*/, void* /*cookie*/)

{

    //ALOGI("Freeing parcel %p", &parcel);

    IF_LOG_COMMANDS() {