summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2013-11-22 07:47:35 -0800
committerMark Salyzyn <salyzyn@google.com>2014-01-27 15:06:22 -0800
commite16baef4d2f59c0b5f78e66c838d6c5e7d9b7363 (patch)
tree78c6b0663ea50237d7547c817ce5434851b1e532
parenta6aad4cdb3ec75668838f3eced59bbb2c7b70c59 (diff)
downloadcore-e16baef4d2f59c0b5f78e66c838d6c5e7d9b7363.tar.gz
core-e16baef4d2f59c0b5f78e66c838d6c5e7d9b7363.tar.bz2
core-e16baef4d2f59c0b5f78e66c838d6c5e7d9b7363.zip
libsysutils: Get rid of warnings
- UNUSED argument warnings - Remove LOG_NDEBUG define (cherry picked from commit 696f267ff5a1e6227c2f5784dae60c190e0228b8) Change-Id: I48b0942adfdb7a46a7693e580bc6ed5a685b0d5b
-rw-r--r--libsysutils/src/FrameworkCommand.cpp5
-rw-r--r--libsysutils/src/FrameworkListener.cpp4
-rw-r--r--libsysutils/src/SocketListener.cpp2
3 files changed, 7 insertions, 4 deletions
diff --git a/libsysutils/src/FrameworkCommand.cpp b/libsysutils/src/FrameworkCommand.cpp
index 038d87edf..0b95a8104 100644
--- a/libsysutils/src/FrameworkCommand.cpp
+++ b/libsysutils/src/FrameworkCommand.cpp
@@ -21,11 +21,14 @@
#include <sysutils/FrameworkCommand.h>
+#define UNUSED __attribute__((unused))
+
FrameworkCommand::FrameworkCommand(const char *cmd) {
mCommand = cmd;
}
-int FrameworkCommand::runCommand(SocketClient *c, int argc, char **argv) {
+int FrameworkCommand::runCommand(SocketClient *c UNUSED, int argc UNUSED,
+ char **argv UNUSED) {
SLOGW("Command %s has no run handler!", getCommand());
errno = ENOSYS;
return -1;
diff --git a/libsysutils/src/FrameworkListener.cpp b/libsysutils/src/FrameworkListener.cpp
index 02a401d41..a5ffda230 100644
--- a/libsysutils/src/FrameworkListener.cpp
+++ b/libsysutils/src/FrameworkListener.cpp
@@ -27,6 +27,8 @@
static const int CMD_BUF_SIZE = 1024;
+#define UNUSED __attribute__((unused))
+
FrameworkListener::FrameworkListener(const char *socketName, bool withSeq) :
SocketListener(socketName, true, withSeq) {
init(socketName, withSeq);
@@ -37,7 +39,7 @@ FrameworkListener::FrameworkListener(const char *socketName) :
init(socketName, false);
}
-void FrameworkListener::init(const char *socketName, bool withSeq) {
+void FrameworkListener::init(const char *socketName UNUSED, bool withSeq) {
mCommands = new FrameworkCommandCollection();
errorRate = 0;
mCommandCount = 0;
diff --git a/libsysutils/src/SocketListener.cpp b/libsysutils/src/SocketListener.cpp
index 0361641e2..0296910ce 100644
--- a/libsysutils/src/SocketListener.cpp
+++ b/libsysutils/src/SocketListener.cpp
@@ -29,8 +29,6 @@
#include <sysutils/SocketListener.h>
#include <sysutils/SocketClient.h>
-#define LOG_NDEBUG 0
-
SocketListener::SocketListener(const char *socketName, bool listen) {
init(socketName, -1, listen, false);
}