Merge "Fix pointer arith."
diff --git a/include/sysutils/SocketClient.h b/include/sysutils/SocketClient.h
index a298f25..4d7c4fa 100644
--- a/include/sysutils/SocketClient.h
+++ b/include/sysutils/SocketClient.h
@@ -45,14 +45,12 @@
int sendMsg(int code, const char *msg, bool addErrno);
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
- // the same format as in sendMsg method above.
- // Sends the code, a space, and a null character.
+ // Provides a mechanism to send a response code to the client.
+ // Sends the code and a null character.
int sendCode(int code);
- // Provides a mechanism to send binary data to client. The message uses the
- // same format as in sendMsg method above.
- // Sends the code, a space, and a null character, followed by 4 bytes of
+ // Provides a mechanism to send binary data to client.
+ // Sends the code and a null character, followed by 4 bytes of
// big-endian length, and the data.
int sendBinaryMsg(int code, const void *data, int len);
diff --git a/libsysutils/src/SocketClient.cpp b/libsysutils/src/SocketClient.cpp
index d9713a6..4a7c82d 100644
--- a/libsysutils/src/SocketClient.cpp
+++ b/libsysutils/src/SocketClient.cpp
@@ -79,16 +79,16 @@
return ret;
}
-
+/** send 3-digit code, null, binary-length, binary data */
int SocketClient::sendBinaryMsg(int code, const void *data, int len) {
- /* 5 bytes for the code & space + 4 bytes for the len */
- char buf[9];
+ /* 4 bytes for the code & null + 4 bytes for the len */
+ char buf[8];
/* Write the code */
- snprintf(buf, 5, "%.3d ", code);
+ snprintf(buf, 4, "%.3d", code);
/* Write the len */
uint32_t tmp = htonl(len);
- memcpy(buf + 5, &tmp, sizeof(uint32_t));
+ memcpy(buf + 4, &tmp, sizeof(uint32_t));
pthread_mutex_lock(&mWriteMutex);
int result = sendDataLocked(buf, sizeof(buf));
@@ -102,9 +102,9 @@
// Sends the code (c-string null-terminated).
int SocketClient::sendCode(int code) {
- char buf[5];
- snprintf(buf, 5, "%.3d ", code);
- return sendData(buf, 5);
+ char buf[4];
+ snprintf(buf, sizeof(buf), "%.3d", code);
+ return sendData(buf, sizeof(buf));
}
int SocketClient::sendMsg(const char *msg) {