am a7c75d1b: am 2d7ec9d7: Merge "Fix build with clang in C++11 mode" (627086c2) · Commits · e / os / android_frameworks_native-old

libs/binder/IPCThreadState.cpp

+6 −6

Original line number	Diff line number	Diff line
		@@ -147,9 +147,9 @@ static const void* printReturnCommand(TextOutput& out, const void* _cmd)
		{
		static const size_t N = sizeof(kReturnStrings)/sizeof(kReturnStrings[0]);
		const int32_t* cmd = (const int32_t*)_cmd;
		int32_t code = *cmd++;
		uint32_t code = (uint32_t)*cmd++;
		size_t cmdIndex = code & 0xff;
		if (code == (int32_t) BR_ERROR) {
		if (code == BR_ERROR) {
		out << "BR_ERROR: " << (void)(long)(cmd++) << endl;
		return cmd;
		} else if (cmdIndex >= N) {
		@@ -208,7 +208,7 @@ static const void* printCommand(TextOutput& out, const void* _cmd)
		{
		static const size_t N = sizeof(kCommandStrings)/sizeof(kCommandStrings[0]);
		const int32_t* cmd = (const int32_t*)_cmd;
		int32_t code = *cmd++;
		uint32_t code = (uint32_t)*cmd++;
		size_t cmdIndex = code & 0xff;

		if (cmdIndex >= N) {
		@@ -697,7 +697,7 @@ status_t IPCThreadState::sendReply(const Parcel& reply, uint32_t flags)

		status_t IPCThreadState::waitForResponse(Parcel reply, status_t acquireResult)
		{
		int32_t cmd;
		uint32_t cmd;
		int32_t err;

		while (1) {
		@@ -706,7 +706,7 @@ status_t IPCThreadState::waitForResponse(Parcel reply, status_t acquireResult)
		if (err < NO_ERROR) break;
		if (mIn.dataAvail() == 0) continue;

		cmd = mIn.readInt32();
		cmd = (uint32_t)mIn.readInt32();

		IF_LOG_COMMANDS() {
		alog << "Processing waitForResponse Command: "
		@@ -936,7 +936,7 @@ status_t IPCThreadState::executeCommand(int32_t cmd)
		RefBase::weakref_type* refs;
		status_t result = NO_ERROR;

		switch (cmd) {
		switch ((uint32_t)cmd) {
		case BR_ERROR:
		result = mIn.readInt32();
		break;