From 6f4f3ab36c5ed1df84eb3a9f7475f0ac42952f58 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 5 Feb 2014 17:42:44 -0800 Subject: [PATCH] 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 --- libs/binder/Binder.cpp | 17 +++++++++-------- libs/binder/BpBinder.cpp | 4 ++-- libs/binder/Debug.cpp | 2 +- libs/binder/IMemory.cpp | 14 +++++++------- libs/binder/IPCThreadState.cpp | 11 ++++++----- libs/binder/MemoryDealer.cpp | 2 +- libs/binder/Parcel.cpp | 23 ++++++++++++----------- libs/binder/ProcessState.cpp | 2 +- 8 files changed, 39 insertions(+), 36 deletions(-) diff --git a/libs/binder/Binder.cpp b/libs/binder/Binder.cpp index 320bdea8f..71e62ab2b 100644 --- a/libs/binder/Binder.cpp +++ b/libs/binder/Binder.cpp @@ -39,7 +39,7 @@ IBinder::~IBinder() // --------------------------------------------------------------------------- -sp IBinder::queryLocalInterface(const String16& descriptor) +sp IBinder::queryLocalInterface(const String16& /*descriptor*/) { return NULL; } @@ -117,19 +117,20 @@ status_t BBinder::transact( } status_t BBinder::linkToDeath( - const sp& recipient, void* cookie, uint32_t flags) + const sp& /*recipient*/, void* /*cookie*/, + uint32_t /*flags*/) { return INVALID_OPERATION; } status_t BBinder::unlinkToDeath( - const wp& recipient, void* cookie, uint32_t flags, - wp* outRecipient) + const wp& /*recipient*/, void* /*cookie*/, + uint32_t /*flags*/, wp* /*outRecipient*/) { return INVALID_OPERATION; } -status_t BBinder::dump(int fd, const Vector& args) + status_t BBinder::dump(int /*fd*/, const Vector& /*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; } diff --git a/libs/binder/BpBinder.cpp b/libs/binder/BpBinder.cpp index 47a62db41..1bad67af2 100644 --- a/libs/binder/BpBinder.cpp +++ b/libs/binder/BpBinder.cpp @@ -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(); diff --git a/libs/binder/Debug.cpp b/libs/binder/Debug.cpp index a8b6e837b..0ffafbbeb 100644 --- a/libs/binder/Debug.cpp +++ b/libs/binder/Debug.cpp @@ -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); } diff --git a/libs/binder/IMemory.cpp b/libs/binder/IMemory.cpp index 07cb41a75..d8ed995a7 100644 --- a/libs/binder/IMemory.cpp +++ b/libs/binder/IMemory.cpp @@ -244,7 +244,7 @@ BpMemoryHeap::~BpMemoryHeap() { sp binder = const_cast(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 HeapCache::find_heap(const sp& 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(info.heap.get())->mSize, static_cast(info.heap.get())->mHeapId, @@ -435,7 +435,7 @@ void HeapCache::free_heap(const wp& 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(info.heap.get())->mSize, static_cast(info.heap.get())->mHeapId, @@ -466,7 +466,7 @@ void HeapCache::dump_heaps() for (int i=0 ; i(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); diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp index 53f098735..cb42549aa 100644 --- a/libs/binder/IPCThreadState.cpp +++ b/libs/binder/IPCThreadState.cpp @@ -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() { diff --git a/libs/binder/MemoryDealer.cpp b/libs/binder/MemoryDealer.cpp index 2c9f2442c..a14c10005 100644 --- a/libs/binder/MemoryDealer.cpp +++ b/libs/binder/MemoryDealer.cpp @@ -210,7 +210,7 @@ Allocation::~Allocation() #ifdef MADV_REMOVE if (size) { int err = madvise(start_ptr, size, MADV_REMOVE); - ALOGW_IF(err, "madvise(%p, %u, MADV_REMOVE) returned %s", + ALOGW_IF(err, "madvise(%p, %zu, MADV_REMOVE) returned %s", start_ptr, size, err<0 ? strerror(errno) : "Ok"); } #endif diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index ee453b657..03bcf01e5 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -104,7 +104,7 @@ void acquire_object(const sp& proc, } } - ALOGD("Invalid object type 0x%08lx", obj.type); + ALOGD("Invalid object type 0x%08x", obj.type); } void release_object(const sp& proc, @@ -140,16 +140,16 @@ void release_object(const sp& proc, } } - ALOGE("Invalid object type 0x%08lx", obj.type); + ALOGE("Invalid object type 0x%08x", obj.type); } inline static status_t finish_flatten_binder( - const sp& binder, const flat_binder_object& flat, Parcel* out) + const sp& /*binder*/, const flat_binder_object& flat, Parcel* out) { return out->writeObject(flat, false); } -status_t flatten_binder(const sp& proc, +status_t flatten_binder(const sp& /*proc*/, const sp& binder, Parcel* out) { flat_binder_object obj; @@ -180,7 +180,7 @@ status_t flatten_binder(const sp& proc, return finish_flatten_binder(binder, obj, out); } -status_t flatten_binder(const sp& proc, +status_t flatten_binder(const sp& /*proc*/, const wp& binder, Parcel* out) { flat_binder_object obj; @@ -229,7 +229,8 @@ status_t flatten_binder(const sp& proc, } inline static status_t finish_unflatten_binder( - BpBinder* proxy, const flat_binder_object& flat, const Parcel& in) + BpBinder* /*proxy*/, const flat_binder_object& /*flat*/, + const Parcel& /*in*/) { return NO_ERROR; } @@ -895,7 +896,7 @@ status_t Parcel::writeNoException() return writeInt32(0); } -void Parcel::remove(size_t start, size_t amt) +void Parcel::remove(size_t /*start*/, size_t /*amt*/) { LOG_ALWAYS_FATAL("Parcel::remove() not yet implemented!"); } @@ -1292,7 +1293,7 @@ const flat_binder_object* Parcel::readObject(bool nullMetaData) const return obj; } } - ALOGW("Attempt to read object from Parcel %p at offset %d that is not in the object list", + ALOGW("Attempt to read object from Parcel %p at offset %zu that is not in the object list", this, DPOS); } return NULL; @@ -1353,13 +1354,13 @@ void Parcel::ipcSetDataReference(const uint8_t* data, size_t dataSize, scanForFds(); } -void Parcel::print(TextOutput& to, uint32_t flags) const +void Parcel::print(TextOutput& to, uint32_t /*flags*/) const { to << "Parcel("; if (errorCheck() != NO_ERROR) { const status_t err = errorCheck(); - to << "Error: " << (void*)err << " \"" << strerror(-err) << "\""; + to << "Error: " << (void*)(intptr_t)err << " \"" << strerror(-err) << "\""; } else if (dataSize() > 0) { const uint8_t* DATA = data(); to << indent << HexDump(DATA, dataSize()) << dedent; @@ -1589,7 +1590,7 @@ status_t Parcel::continueWrite(size_t desired) if(!(mDataCapacity == 0 && mObjects == NULL && mObjectsCapacity == 0)) { - ALOGE("continueWrite: %d/%p/%d/%d", mDataCapacity, mObjects, mObjectsCapacity, desired); + ALOGE("continueWrite: %zu/%p/%zu/%zu", mDataCapacity, mObjects, mObjectsCapacity, desired); } mData = data; diff --git a/libs/binder/ProcessState.cpp b/libs/binder/ProcessState.cpp index c1e49bc8f..01639061e 100644 --- a/libs/binder/ProcessState.cpp +++ b/libs/binder/ProcessState.cpp @@ -86,7 +86,7 @@ void ProcessState::setContextObject(const sp& object) setContextObject(object, String16("default")); } -sp ProcessState::getContextObject(const sp& caller) +sp ProcessState::getContextObject(const sp& /*caller*/) { return getStrongProxyForHandle(0); }