ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libsysutils: const correctness fixes + remove some debugging

Browse source 
Signed-off-by: San Mehat <san@google.com>
This commit is contained in:
San Mehat 2009-05-20 15:27:14 -07:00
parent 2fd9c5897a
commit db01754579
6 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/sysutils/FrameworkClient.h
View file

@ -13,8 +13,8 @@ public:
FrameworkClient(int sock); FrameworkClient(int sock);
virtual ~FrameworkClient() {} virtual ~FrameworkClient() {}
int sendMsg(char *msg); int sendMsg(const char *msg);
int sendMsg(char *msg, char *data); int sendMsg(const char *msg, const char *data);
}; };
typedef android::List<FrameworkClient *> FrameworkClientCollection; typedef android::List<FrameworkClient *> FrameworkClientCollection;

4
include/sysutils/SocketClient.h
View file

@ -15,8 +15,8 @@ public:
int getSocket() { return mSocket; } int getSocket() { return mSocket; }
int sendMsg(int code, char *msg, bool addErrno); int sendMsg(int code, const char *msg, bool addErrno);
int sendMsg(char *msg); int sendMsg(const char *msg);
}; };
typedef android::List<SocketClient *> SocketClientCollection; typedef android::List<SocketClient *> SocketClientCollection;

4
include/sysutils/SocketListener.h
View file

@ -37,8 +37,8 @@ public:
int startListener(); int startListener();
int stopListener(); int stopListener();
void sendBroadcast(int code, char *msg, bool addErrno); void sendBroadcast(int code, const char *msg, bool addErrno);
void sendBroadcast(char *msg); void sendBroadcast(const char *msg);
protected: protected:
virtual bool onDataAvailable(SocketClient *c) = 0; virtual bool onDataAvailable(SocketClient *c) = 0;

5
libsysutils/src/FrameworkClient.cpp
View file

@ -13,8 +13,7 @@ FrameworkClient::FrameworkClient(int socket) {
pthread_mutex_init(&mWriteMutex, NULL); pthread_mutex_init(&mWriteMutex, NULL);
} }
int FrameworkClient::sendMsg(char *msg) { int FrameworkClient::sendMsg(const char *msg) {
LOGD("FrameworkClient::sendMsg(%s)", msg);
if (mSocket < 0) { if (mSocket < 0) {
errno = EHOSTUNREACH; errno = EHOSTUNREACH;
return -1; return -1;
@ -28,7 +27,7 @@ int FrameworkClient::sendMsg(char *msg) {
return 0; 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); char *buffer = (char *) alloca(strlen(msg) + strlen(data) + 1);
if (!buffer) { if (!buffer) {
errno = -ENOMEM; errno = -ENOMEM;

21
libsysutils/src/SocketClient.cpp
View file

@ -14,7 +14,7 @@ SocketClient::SocketClient(int socket) {
pthread_mutex_init(&mWriteMutex, NULL); 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; char *buf;
if (addErrno) { if (addErrno) {
@ -27,23 +27,24 @@ int SocketClient::sendMsg(int code, char *msg, bool addErrno) {
return sendMsg(buf); return sendMsg(buf);
} }
int SocketClient::sendMsg(char *msg) { int SocketClient::sendMsg(const char *msg) {
if (mSocket < 0) { if (mSocket < 0) {
errno = EHOSTUNREACH; errno = EHOSTUNREACH;
return -1; return -1;
} }
char *bp; char *tmp;
const char *bp = msg;
if (msg[strlen(msg)] != '\n') { if (msg[strlen(msg)] != '\n') {
bp = (char *) alloca(strlen(msg) + 1); tmp = (char *) alloca(strlen(msg) + 1);
strcpy(bp, msg); strcpy(tmp, msg);
strcat(bp, "\n"); strcat(tmp, "\n");
} else bp = tmp;
bp = msg; }
int rc = 0; int rc = 0;
char *p = bp; const char *p = bp;
int brtw = strlen(bp); int brtw = strlen(bp);
pthread_mutex_lock(&mWriteMutex); pthread_mutex_lock(&mWriteMutex);

4
libsysutils/src/SocketListener.cpp
View file

@ -173,7 +173,7 @@ void SocketListener::runListener() {
} }
} }
void SocketListener::sendBroadcast(int code, char *msg, bool addErrno) { void SocketListener::sendBroadcast(int code, const char *msg, bool addErrno) {
pthread_mutex_lock(&mClientsLock); pthread_mutex_lock(&mClientsLock);
SocketClientCollection::iterator i; SocketClientCollection::iterator i;
@ -185,7 +185,7 @@ void SocketListener::sendBroadcast(int code, char *msg, bool addErrno) {
pthread_mutex_unlock(&mClientsLock); pthread_mutex_unlock(&mClientsLock);
} }
void SocketListener::sendBroadcast(char *msg) { void SocketListener::sendBroadcast(const char *msg) {
pthread_mutex_lock(&mClientsLock); pthread_mutex_lock(&mClientsLock);
SocketClientCollection::iterator i; SocketClientCollection::iterator i;