Revert "Fix warnings in servicemanager and KeyCharacterMap"
This reverts commit d3b4c050f6bcdfd44bfb9c8ed885fd1c482c50bb.
Change-Id: I961f89d4446ac23f0e267c6541b504c4ec6b3af1
diff --git a/cmds/servicemanager/Android.mk b/cmds/servicemanager/Android.mk
index 73c0367..7ee0dd1 100644
--- a/cmds/servicemanager/Android.mk
+++ b/cmds/servicemanager/Android.mk
@@ -1,7 +1,7 @@
LOCAL_PATH:= $(call my-dir)
svc_c_flags = \
- -Wall -Wextra -Werror \
+ -Wall -Wextra \
ifneq ($(TARGET_USES_64_BIT_BINDER),true)
ifneq ($(TARGET_IS_64_BIT),true)
diff --git a/cmds/servicemanager/binder.c b/cmds/servicemanager/binder.c
index 9e99085..3d14451 100644
--- a/cmds/servicemanager/binder.c
+++ b/cmds/servicemanager/binder.c
@@ -449,7 +449,7 @@
}
void binder_done(struct binder_state *bs,
- __unused struct binder_io *msg,
+ struct binder_io *msg,
struct binder_io *reply)
{
struct {
diff --git a/cmds/servicemanager/service_manager.c b/cmds/servicemanager/service_manager.c
index 21fdff0..8596f96 100644
--- a/cmds/servicemanager/service_manager.c
+++ b/cmds/servicemanager/service_manager.c
@@ -178,7 +178,7 @@
};
-uint32_t do_find_service(const uint16_t *s, size_t len, uid_t uid, pid_t spid)
+uint32_t do_find_service(struct binder_state *bs, const uint16_t *s, size_t len, uid_t uid, pid_t spid)
{
struct svcinfo *si = find_svc(s, len);
@@ -304,7 +304,7 @@
if (s == NULL) {
return -1;
}
- handle = do_find_service(s, len, txn->sender_euid, txn->sender_pid);
+ handle = do_find_service(bs, s, len, txn->sender_euid, txn->sender_pid);
if (!handle)
break;
bio_put_ref(reply, handle);
@@ -349,7 +349,7 @@
}
-static int audit_callback(void *data, __unused security_class_t cls, char *buf, size_t len)
+static int audit_callback(void *data, security_class_t cls, char *buf, size_t len)
{
struct audit_data *ad = (struct audit_data *)data;
@@ -362,7 +362,7 @@
return 0;
}
-int main()
+int main(int argc, char **argv)
{
struct binder_state *bs;
diff --git a/libs/input/KeyCharacterMap.cpp b/libs/input/KeyCharacterMap.cpp
index 0627ca6..fe649fb 100644
--- a/libs/input/KeyCharacterMap.cpp
+++ b/libs/input/KeyCharacterMap.cpp
@@ -608,7 +608,7 @@
return NULL;
}
if (numKeys > MAX_KEYS) {
- ALOGE("Too many keys in KeyCharacterMap (%zu > %d)", numKeys, MAX_KEYS);
+ ALOGE("Too many keys in KeyCharacterMap (%d > %d)", numKeys, MAX_KEYS);
return NULL;
}