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

Commit 63d84d04 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android (Google) Code Review
Browse files

Merge "Fix pointer arith."

parents 6ff1bee1 7599bfcf

include/sysutils/SocketClient.h

+4 −6
Original line number Original line Diff line number Diff line
@@ -45,14 +45,12 @@ public: 
    int sendMsg(int code, const char *msg, bool addErrno);

    int sendMsg(int code, const char *msg, bool addErrno);

    int sendMsg(int code, const char *msg, bool addErrno, bool useCmdNum);

    int sendMsg(int code, const char *msg, bool addErrno, bool useCmdNum);





    // Provides a mechanism to send a response code to the client. The message uses

    // Provides a mechanism to send a response code to the client.

    // the same format as in sendMsg method above.

    // Sends the code and a null character.

    // Sends the code, a space, and a null character.

    int sendCode(int code);

    int sendCode(int code);





    // Provides a mechanism to send binary data to client. The message uses the

    // Provides a mechanism to send binary data to client.

    // same format as in sendMsg method above.

    // Sends the code and a null character, followed by 4 bytes of

    // Sends the code, a space, and a null character, followed by 4 bytes of

    // big-endian length, and the data.

    // big-endian length, and the data.

    int sendBinaryMsg(int code, const void *data, int len);

    int sendBinaryMsg(int code, const void *data, int len);

libsysutils/src/SocketClient.cpp

+8 −8
Original line number Original line Diff line number Diff line
@@ -79,16 +79,16 @@ int SocketClient::sendMsg(int code, const char *msg, bool addErrno, bool useCmdN 
    return ret;

    return ret;

}

}







/** send 3-digit code, null, binary-length, binary data */

int SocketClient::sendBinaryMsg(int code, const void *data, int len) {

int SocketClient::sendBinaryMsg(int code, const void *data, int len) {





    /* 5 bytes for the code & space + 4 bytes for the len */

    /* 4 bytes for the code & null + 4 bytes for the len */

    char buf[9];

    char buf[8];

    /* Write the code */

    /* Write the code */

    snprintf(buf, 5, "%.3d ", code);

    snprintf(buf, 4, "%.3d", code);

    /* Write the len */

    /* Write the len */

    uint32_t tmp = htonl(len);

    uint32_t tmp = htonl(len);

    memcpy(buf + 5, &tmp, sizeof(uint32_t));

    memcpy(buf + 4, &tmp, sizeof(uint32_t));





    pthread_mutex_lock(&mWriteMutex);

    pthread_mutex_lock(&mWriteMutex);

    int result = sendDataLocked(buf, sizeof(buf));

    int result = sendDataLocked(buf, sizeof(buf));
@@ -102,9 +102,9 @@ int SocketClient::sendBinaryMsg(int code, const void *data, int len) { 




// Sends the code (c-string null-terminated).

// Sends the code (c-string null-terminated).

int SocketClient::sendCode(int code) {

int SocketClient::sendCode(int code) {

    char buf[5];

    char buf[4];

    snprintf(buf, 5, "%.3d ", code);

    snprintf(buf, sizeof(buf), "%.3d", code);

    return sendData(buf, 5);

    return sendData(buf, sizeof(buf));

}

}





int SocketClient::sendMsg(const char *msg) {

int SocketClient::sendMsg(const char *msg) {