diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2012-05-30 14:57:50 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-05-30 14:57:50 -0700 |
| commit | ff856a2b927aaadb189181d2cd9dd08dc98456a4 (patch) | |
| tree | 8e932ad0f6147550bc4d2b31d74076bfc8025e70 /libsysutils | |
| parent | 1d5e7885698ca81241f10d06d475ef4e6075089b (diff) | |
| parent | 2e5fcd08ac177e984ebf1fb05bab5dfcf296c5a4 (diff) | |
| download | system_core-ff856a2b927aaadb189181d2cd9dd08dc98456a4.zip system_core-ff856a2b927aaadb189181d2cd9dd08dc98456a4.tar.gz system_core-ff856a2b927aaadb189181d2cd9dd08dc98456a4.tar.bz2 | |
Merge "Add error handling to SocketClient::sendData"
Diffstat (limited to 'libsysutils')
| -rw-r--r-- | libsysutils/src/SocketClient.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libsysutils/src/SocketClient.cpp b/libsysutils/src/SocketClient.cpp index 722dcb2..69d165a 100644 --- a/libsysutils/src/SocketClient.cpp +++ b/libsysutils/src/SocketClient.cpp @@ -64,11 +64,6 @@ int SocketClient::sendMsg(int code, const char *msg, bool addErrno) { } int SocketClient::sendMsg(const char *msg) { - if (mSocket < 0) { - errno = EHOSTUNREACH; - return -1; - } - // Send the message including null character if (sendData(msg, strlen(msg) + 1) != 0) { 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; int brtw = len; + if (mSocket < 0) { + errno = EHOSTUNREACH; + return -1; + } + if (len == 0) { return 0; } |