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

Commit db017545 authored by San Mehat's avatar San Mehat
Browse files

libsysutils: const correctness fixes + remove some debugging 



Signed-off-by: default avatarSan Mehat <san@google.com>
parent 2fd9c589

include/sysutils/FrameworkClient.h

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ public: 
    FrameworkClient(int sock);

    virtual ~FrameworkClient() {}



    int sendMsg(char *msg);

    int sendMsg(char *msg, char *data);

    int sendMsg(const char *msg);

    int sendMsg(const char *msg, const char *data);

};



typedef android::List<FrameworkClient *> FrameworkClientCollection;

include/sysutils/SocketClient.h

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ public: 


    int getSocket() { return mSocket; }



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

    int sendMsg(char *msg);

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

    int sendMsg(const char *msg);

};



typedef android::List<SocketClient *> SocketClientCollection;

include/sysutils/SocketListener.h

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ public: 
    int startListener();

    int stopListener();



    void sendBroadcast(int code, char *msg, bool addErrno);

    void sendBroadcast(char *msg);

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

    void sendBroadcast(const char *msg);



protected:

    virtual bool onDataAvailable(SocketClient *c) = 0;

libsysutils/src/FrameworkClient.cpp

+2 −3
Original line number Diff line number Diff line
@@ -13,8 +13,7 @@ FrameworkClient::FrameworkClient(int socket) { 
    pthread_mutex_init(&mWriteMutex, NULL);

}



int FrameworkClient::sendMsg(char *msg) {

    LOGD("FrameworkClient::sendMsg(%s)", msg);

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

    if (mSocket < 0) {

        errno = EHOSTUNREACH;

        return -1;
@@ -28,7 +27,7 @@ int FrameworkClient::sendMsg(char *msg) { 
    return 0;

}



int FrameworkClient::sendMsg(char *msg, char *data) {

int FrameworkClient::sendMsg(const char *msg, const char *data) {

    char *buffer = (char *) alloca(strlen(msg) + strlen(data) + 1);

    if (!buffer) {

        errno = -ENOMEM;

libsysutils/src/SocketClient.cpp

+11 −10
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ SocketClient::SocketClient(int socket) { 
    pthread_mutex_init(&mWriteMutex, NULL);

}



int SocketClient::sendMsg(int code, char *msg, bool addErrno) {

int SocketClient::sendMsg(int code, const char *msg, bool addErrno) {

    char *buf;

    

    if (addErrno) {
@@ -27,23 +27,24 @@ int SocketClient::sendMsg(int code, char *msg, bool addErrno) { 
    return sendMsg(buf);

}



int SocketClient::sendMsg(char *msg) {

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

    if (mSocket < 0) {

        errno = EHOSTUNREACH;

        return -1;

    }



    char *bp;

    char *tmp;

    const char *bp = msg;



    if (msg[strlen(msg)] != '\n') {

        bp = (char *) alloca(strlen(msg) + 1);

        strcpy(bp, msg);

        strcat(bp, "\n");

    } else

        bp = msg;

        tmp = (char *) alloca(strlen(msg) + 1);

        strcpy(tmp, msg);

        strcat(tmp, "\n");

        bp = tmp;

    }

       

    int rc = 0;

    char *p = bp;

    const char *p = bp;

    int brtw = strlen(bp);



    pthread_mutex_lock(&mWriteMutex);