Loading libsysutils/src/FrameworkClient.cpp +6 −4 Original line number Diff line number Diff line Loading @@ -14,13 +14,15 @@ FrameworkClient::FrameworkClient(int socket) { } int FrameworkClient::sendMsg(const char *msg) { int ret; if (mSocket < 0) { errno = EHOSTUNREACH; return -1; } pthread_mutex_lock(&mWriteMutex); if (write(mSocket, msg, strlen(msg) +1) < 0) { ret = TEMP_FAILURE_RETRY(write(mSocket, msg, strlen(msg) +1)); if (ret < 0) { SLOGW("Unable to send msg '%s' (%s)", msg, strerror(errno)); } pthread_mutex_unlock(&mWriteMutex); Loading @@ -28,13 +30,13 @@ int FrameworkClient::sendMsg(const char *msg) { } int FrameworkClient::sendMsg(const char *msg, const char *data) { char *buffer = (char *) alloca(strlen(msg) + strlen(data) + 1); size_t bufflen = strlen(msg) + strlen(data) + 1; char *buffer = (char *) alloca(bufflen); if (!buffer) { errno = -ENOMEM; return -1; } strcpy(buffer, msg); strcat(buffer, data); snprintf(buffer, bufflen, "%s%s", msg, data); return sendMsg(buffer); } Loading
libsysutils/src/FrameworkClient.cpp +6 −4 Original line number Diff line number Diff line Loading @@ -14,13 +14,15 @@ FrameworkClient::FrameworkClient(int socket) { } int FrameworkClient::sendMsg(const char *msg) { int ret; if (mSocket < 0) { errno = EHOSTUNREACH; return -1; } pthread_mutex_lock(&mWriteMutex); if (write(mSocket, msg, strlen(msg) +1) < 0) { ret = TEMP_FAILURE_RETRY(write(mSocket, msg, strlen(msg) +1)); if (ret < 0) { SLOGW("Unable to send msg '%s' (%s)", msg, strerror(errno)); } pthread_mutex_unlock(&mWriteMutex); Loading @@ -28,13 +30,13 @@ int FrameworkClient::sendMsg(const char *msg) { } int FrameworkClient::sendMsg(const char *msg, const char *data) { char *buffer = (char *) alloca(strlen(msg) + strlen(data) + 1); size_t bufflen = strlen(msg) + strlen(data) + 1; char *buffer = (char *) alloca(bufflen); if (!buffer) { errno = -ENOMEM; return -1; } strcpy(buffer, msg); strcat(buffer, data); snprintf(buffer, bufflen, "%s%s", msg, data); return sendMsg(buffer); }