ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Add error handling to SocketClient::sendData"

Browse source
This commit is contained in:
Robert Greenwalt 2012-05-30 14:57:50 -07:00 • committed by android code review
commit ff856a2b92
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libsysutils/src/SocketClient.cpp
View file

@ -64,11 +64,6 @@ int SocketClient::sendMsg(int code, const char *msg, bool addErrno) {
} }
int SocketClient::sendMsg(const char *msg) { int SocketClient::sendMsg(const char *msg) {
if (mSocket < 0) {
errno = EHOSTUNREACH;
return -1;
}
// Send the message including null character // Send the message including null character
if (sendData(msg, strlen(msg) + 1) != 0) { if (sendData(msg, strlen(msg) + 1) != 0) {
SLOGW("Unable to send msg '%s'", msg); SLOGW("Unable to send msg '%s'", msg);
@ -82,6 +77,11 @@ int SocketClient::sendData(const void* data, int len) {
const char *p = (const char*) data; const char *p = (const char*) data;
int brtw = len; int brtw = len;
if (mSocket < 0) {
errno = EHOSTUNREACH;
return -1;
}
if (len == 0) { if (len == 0) {
return 0; return 0;
} }