Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1cd8b94 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am 6f523cda: am 7bb1b958: am ff856a2b: Merge "Add error handling to SocketClient::sendData" 

* commit '6f523cda':
  Add error handling to SocketClient::sendData
parents 393e559d 6f523cda

libsysutils/src/SocketClient.cpp

+5 −5
Original line number Diff line number Diff line
@@ -131,11 +131,6 @@ char *SocketClient::quoteArg(const char *arg) { 




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);
@@ -158,6 +153,11 @@ int SocketClient::sendDataLocked(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;

    }