ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am a28750ee: Merge "binder: Turn on -Werror"

Browse Source 
* commit 'a28750eec38c848230adfeef28725b29cc36a9da':
  binder: Turn on -Werror
This commit is contained in:
Mark Salyzyn 2014-06-03 20:48:35 +00:00 committed by Android Git Automerger
commit f0a2475905
3 changed files with 70 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/binder/Android.mk
View File

@ -46,6 +46,7 @@ ifneq ($(TARGET_IS_64_BIT),true)
LOCAL_CFLAGS += -DBINDER_IPC_32BIT=1 LOCAL_CFLAGS += -DBINDER_IPC_32BIT=1
endif endif
endif endif
LOCAL_CFLAGS += -Werror
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@ -57,4 +58,5 @@ ifneq ($(TARGET_IS_64_BIT),true)
LOCAL_CFLAGS += -DBINDER_IPC_32BIT=1 LOCAL_CFLAGS += -DBINDER_IPC_32BIT=1
endif endif
endif endif
LOCAL_CFLAGS += -Werror
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

6
libs/binder/BpBinder.cpp
View File

@ -73,7 +73,7 @@ void BpBinder::ObjectManager::detach(const void* objectID)
void BpBinder::ObjectManager::kill() void BpBinder::ObjectManager::kill()
{ {
const size_t N = mObjects.size(); const size_t N = mObjects.size();
ALOGV("Killing %d objects in manager %p", N, this); ALOGV("Killing %zu objects in manager %p", N, this);
for (size_t i=0; i<N; i++) { for (size_t i=0; i<N; i++) {
const entry_t& e = mObjects.valueAt(i); const entry_t& e = mObjects.valueAt(i);
if (e.func != NULL) { if (e.func != NULL) {
@ -260,8 +260,8 @@ void BpBinder::sendObituary()
mObitsSent = 1; mObitsSent = 1;
mLock.unlock(); mLock.unlock();
ALOGV("Reporting death of proxy %p for %d recipients\n", ALOGV("Reporting death of proxy %p for %zu recipients\n",
this, obits ? obits->size() : 0); this, obits ? obits->size() : 0U);
if (obits != NULL) { if (obits != NULL) {
const size_t N = obits->size(); const size_t N = obits->size();

60
libs/binder/Parcel.cpp
View File

@ -336,7 +336,7 @@ status_t Parcel::setDataSize(size_t size)
err = continueWrite(size); err = continueWrite(size);
if (err == NO_ERROR) { if (err == NO_ERROR) {
mDataSize = size; mDataSize = size;
ALOGV("setDataSize Setting data size of %p to %d\n", this, mDataSize); ALOGV("setDataSize Setting data size of %p to %zu", this, mDataSize);
} }
return err; return err;
} }
@ -510,7 +510,7 @@ bool Parcel::enforceInterface(const String16& interface,
if (str == interface) { if (str == interface) {
return true; return true;
} else { } else {
ALOGW("**** enforceInterface() expected '%s' but read '%s'\n", ALOGW("**** enforceInterface() expected '%s' but read '%s'",
String8(interface).string(), String8(str).string()); String8(interface).string(), String8(str).string());
return false; return false;
} }
@ -540,10 +540,10 @@ status_t Parcel::finishWrite(size_t len)
{ {
//printf("Finish write of %d\n", len); //printf("Finish write of %d\n", len);
mDataPos += len; mDataPos += len;
ALOGV("finishWrite Setting data pos of %p to %d\n", this, mDataPos); ALOGV("finishWrite Setting data pos of %p to %zu", this, mDataPos);
if (mDataPos > mDataSize) { if (mDataPos > mDataSize) {
mDataSize = mDataPos; mDataSize = mDataPos;
ALOGV("finishWrite Setting data size of %p to %d\n", this, mDataSize); ALOGV("finishWrite Setting data size of %p to %zu", this, mDataSize);
} }
//printf("New pos=%d, size=%d\n", mDataPos, mDataSize); //printf("New pos=%d, size=%d\n", mDataPos, mDataSize);
return NO_ERROR; return NO_ERROR;
@ -922,7 +922,7 @@ status_t Parcel::read(void* outData, size_t len) const
&& len <= PAD_SIZE(len)) { && len <= PAD_SIZE(len)) {
memcpy(outData, mData+mDataPos, len); memcpy(outData, mData+mDataPos, len);
mDataPos += PAD_SIZE(len); mDataPos += PAD_SIZE(len);
ALOGV("read Setting data pos of %p to %d\n", this, mDataPos); ALOGV("read Setting data pos of %p to %zu", this, mDataPos);
return NO_ERROR; return NO_ERROR;
} }
return NOT_ENOUGH_DATA; return NOT_ENOUGH_DATA;
@ -934,7 +934,7 @@ const void* Parcel::readInplace(size_t len) const
&& len <= PAD_SIZE(len)) { && len <= PAD_SIZE(len)) {
const void* data = mData+mDataPos; const void* data = mData+mDataPos;
mDataPos += PAD_SIZE(len); mDataPos += PAD_SIZE(len);
ALOGV("readInplace Setting data pos of %p to %d\n", this, mDataPos); ALOGV("readInplace Setting data pos of %p to %zu", this, mDataPos);
return data; return data;
} }
return NULL; return NULL;
@ -1088,7 +1088,7 @@ const char* Parcel::readCString() const
if (eos) { if (eos) {
const size_t len = eos - str; const size_t len = eos - str;
mDataPos += PAD_SIZE(len+1); mDataPos += PAD_SIZE(len+1);
ALOGV("readCString Setting data pos of %p to %d\n", this, mDataPos); ALOGV("readCString Setting data pos of %p to %zu", this, mDataPos);
return str; return str;
} }
} }
@ -1190,7 +1190,7 @@ int Parcel::readFileDescriptor() const
if (flat) { if (flat) {
switch (flat->type) { switch (flat->type) {
case BINDER_TYPE_FD: case BINDER_TYPE_FD:
//ALOGI("Returning file descriptor %ld from parcel %p\n", flat->handle, this); //ALOGI("Returning file descriptor %ld from parcel %p", flat->handle, this);
return flat->handle; return flat->handle;
} }
} }
@ -1244,7 +1244,7 @@ status_t Parcel::read(FlattenableHelperInterface& val) const
fds[i] = dup(this->readFileDescriptor()); fds[i] = dup(this->readFileDescriptor());
if (fds[i] < 0) { if (fds[i] < 0) {
err = BAD_VALUE; err = BAD_VALUE;
ALOGE("dup() failed in Parcel::read, i is %d, fds[i] is %d, fd_count is %d, error: %s", ALOGE("dup() failed in Parcel::read, i is %zu, fds[i] is %d, fd_count is %zu, error: %s",
i, fds[i], fd_count, strerror(errno)); i, fds[i], fd_count, strerror(errno));
} }
} }
@ -1270,7 +1270,7 @@ const flat_binder_object* Parcel::readObject(bool nullMetaData) const
// When transferring a NULL object, we don't write it into // When transferring a NULL object, we don't write it into
// the object list, so we don't want to check for it when // the object list, so we don't want to check for it when
// reading. // reading.
ALOGV("readObject Setting data pos of %p to %d\n", this, mDataPos); ALOGV("readObject Setting data pos of %p to %zu", this, mDataPos);
return obj; return obj;
} }
@ -1280,7 +1280,7 @@ const flat_binder_object* Parcel::readObject(bool nullMetaData) const
size_t opos = mNextObjectHint; size_t opos = mNextObjectHint;
if (N > 0) { if (N > 0) {
ALOGV("Parcel %p looking for obj at %d, hint=%d\n", ALOGV("Parcel %p looking for obj at %zu, hint=%zu",
this, DPOS, opos); this, DPOS, opos);
// Start at the current hint position, looking for an object at // Start at the current hint position, looking for an object at
@ -1294,10 +1294,10 @@ const flat_binder_object* Parcel::readObject(bool nullMetaData) const
} }
if (OBJS[opos] == DPOS) { if (OBJS[opos] == DPOS) {
// Found it! // Found it!
ALOGV("Parcel found obj %d at index %d with forward search", ALOGV("Parcel %p found obj %zu at index %zu with forward search",
this, DPOS, opos); this, DPOS, opos);
mNextObjectHint = opos+1; mNextObjectHint = opos+1;
ALOGV("readObject Setting data pos of %p to %d\n", this, mDataPos); ALOGV("readObject Setting data pos of %p to %zu", this, mDataPos);
return obj; return obj;
} }
@ -1307,10 +1307,10 @@ const flat_binder_object* Parcel::readObject(bool nullMetaData) const
} }
if (OBJS[opos] == DPOS) { if (OBJS[opos] == DPOS) {
// Found it! // Found it!
ALOGV("Parcel found obj %d at index %d with backward search", ALOGV("Parcel %p found obj %zu at index %zu with backward search",
this, DPOS, opos); this, DPOS, opos);
mNextObjectHint = opos+1; mNextObjectHint = opos+1;
ALOGV("readObject Setting data pos of %p to %d\n", this, mDataPos); ALOGV("readObject Setting data pos of %p to %zu", this, mDataPos);
return obj; return obj;
} }
} }
@ -1324,14 +1324,14 @@ void Parcel::closeFileDescriptors()
{ {
size_t i = mObjectsSize; size_t i = mObjectsSize;
if (i > 0) { if (i > 0) {
//ALOGI("Closing file descriptors for %d objects...", mObjectsSize); //ALOGI("Closing file descriptors for %zu objects...", i);
} }
while (i > 0) { while (i > 0) {
i--; i--;
const flat_binder_object* flat const flat_binder_object* flat
= reinterpret_cast<flat_binder_object*>(mData+mObjects[i]); = reinterpret_cast<flat_binder_object*>(mData+mObjects[i]);
if (flat->type == BINDER_TYPE_FD) { if (flat->type == BINDER_TYPE_FD) {
//ALOGI("Closing fd: %ld\n", flat->handle); //ALOGI("Closing fd: %ld", flat->handle);
close(flat->handle); close(flat->handle);
} }
} }
@ -1365,9 +1365,9 @@ void Parcel::ipcSetDataReference(const uint8_t* data, size_t dataSize,
mError = NO_ERROR; mError = NO_ERROR;
mData = const_cast<uint8_t*>(data); mData = const_cast<uint8_t*>(data);
mDataSize = mDataCapacity = dataSize; mDataSize = mDataCapacity = dataSize;
//ALOGI("setDataReference Setting data size of %p to %lu (pid=%d)\n", this, mDataSize, getpid()); //ALOGI("setDataReference Setting data size of %p to %lu (pid=%d)", this, mDataSize, getpid());
mDataPos = 0; mDataPos = 0;
ALOGV("setDataReference Setting data pos of %p to %d\n", this, mDataPos); ALOGV("setDataReference Setting data pos of %p to %zu", this, mDataPos);
mObjects = const_cast<binder_size_t*>(objects); mObjects = const_cast<binder_size_t*>(objects);
mObjectsSize = mObjectsCapacity = objectsCount; mObjectsSize = mObjectsCapacity = objectsCount;
mNextObjectHint = 0; mNextObjectHint = 0;
@ -1449,7 +1449,7 @@ void Parcel::freeData()
void Parcel::freeDataNoInit() void Parcel::freeDataNoInit()
{ {
if (mOwner) { if (mOwner) {
//ALOGI("Freeing data ref of %p (pid=%d)\n", this, getpid()); //ALOGI("Freeing data ref of %p (pid=%d)", this, getpid());
mOwner(this, mData, mDataSize, mObjects, mObjectsSize, mOwnerCookie); mOwner(this, mData, mDataSize, mObjects, mObjectsSize, mOwnerCookie);
} else { } else {
releaseObjects(); releaseObjects();
@ -1487,8 +1487,8 @@ status_t Parcel::restartWrite(size_t desired)
} }
mDataSize = mDataPos = 0; mDataSize = mDataPos = 0;
ALOGV("restartWrite Setting data size of %p to %d\n", this, mDataSize); ALOGV("restartWrite Setting data size of %p to %zu", this, mDataSize);
ALOGV("restartWrite Setting data pos of %p to %d\n", this, mDataPos); ALOGV("restartWrite Setting data pos of %p to %zu", this, mDataPos);
free(mObjects); free(mObjects);
mObjects = NULL; mObjects = NULL;
@ -1557,14 +1557,14 @@ status_t Parcel::continueWrite(size_t desired)
if (objects && mObjects) { if (objects && mObjects) {
memcpy(objects, mObjects, objectsSize*sizeof(binder_size_t)); memcpy(objects, mObjects, objectsSize*sizeof(binder_size_t));
} }
//ALOGI("Freeing data ref of %p (pid=%d)\n", this, getpid()); //ALOGI("Freeing data ref of %p (pid=%d)", this, getpid());
mOwner(this, mData, mDataSize, mObjects, mObjectsSize, mOwnerCookie); mOwner(this, mData, mDataSize, mObjects, mObjectsSize, mOwnerCookie);
mOwner = NULL; mOwner = NULL;
mData = data; mData = data;
mObjects = objects; mObjects = objects;
mDataSize = (mDataSize < desired) ? mDataSize : desired; mDataSize = (mDataSize < desired) ? mDataSize : desired;
ALOGV("continueWrite Setting data size of %p to %d\n", this, mDataSize); ALOGV("continueWrite Setting data size of %p to %zu", this, mDataSize);
mDataCapacity = desired; mDataCapacity = desired;
mObjectsSize = mObjectsCapacity = objectsSize; mObjectsSize = mObjectsCapacity = objectsSize;
mNextObjectHint = 0; mNextObjectHint = 0;
@ -1604,11 +1604,11 @@ status_t Parcel::continueWrite(size_t desired)
} else { } else {
if (mDataSize > desired) { if (mDataSize > desired) {
mDataSize = desired; mDataSize = desired;
ALOGV("continueWrite Setting data size of %p to %d\n", this, mDataSize); ALOGV("continueWrite Setting data size of %p to %zu", this, mDataSize);
} }
if (mDataPos > desired) { if (mDataPos > desired) {
mDataPos = desired; mDataPos = desired;
ALOGV("continueWrite Setting data pos of %p to %d\n", this, mDataPos); ALOGV("continueWrite Setting data pos of %p to %zu", this, mDataPos);
} }
} }
@ -1627,8 +1627,8 @@ status_t Parcel::continueWrite(size_t desired)
mData = data; mData = data;
mDataSize = mDataPos = 0; mDataSize = mDataPos = 0;
ALOGV("continueWrite Setting data size of %p to %d\n", this, mDataSize); ALOGV("continueWrite Setting data size of %p to %zu", this, mDataSize);
ALOGV("continueWrite Setting data pos of %p to %d\n", this, mDataPos); ALOGV("continueWrite Setting data pos of %p to %zu", this, mDataPos);
mDataCapacity = desired; mDataCapacity = desired;
} }
@ -1642,8 +1642,8 @@ void Parcel::initState()
mDataSize = 0; mDataSize = 0;
mDataCapacity = 0; mDataCapacity = 0;
mDataPos = 0; mDataPos = 0;
ALOGV("initState Setting data size of %p to %d\n", this, mDataSize); ALOGV("initState Setting data size of %p to %zu", this, mDataSize);
ALOGV("initState Setting data pos of %p to %d\n", this, mDataPos); ALOGV("initState Setting data pos of %p to %zu", this, mDataPos);
mObjects = NULL; mObjects = NULL;
mObjectsSize = 0; mObjectsSize = 0;
mObjectsCapacity = 0; mObjectsCapacity = 0;