am be15d16b: Merge "Turn on -Wunused and fix the mistakes it uncovers."

* commit 'be15d16b7246e32a1e622d4442cf919646bc71a9':
  Turn on -Wunused and fix the mistakes it uncovers.
This commit is contained in:
Elliott Hughes 2014-06-03 23:24:39 +00:00 committed by Android Git Automerger
commit 859817602d
10 changed files with 10 additions and 11 deletions

View File

@ -24,7 +24,7 @@ LOCAL_PATH := $(call my-dir)
benchmark_c_flags = \ benchmark_c_flags = \
-O2 \ -O2 \
-Wall -Wextra \ -Wall -Wextra -Wunused \
-Werror \ -Werror \
-fno-builtin \ -fno-builtin \
-std=gnu++11 \ -std=gnu++11 \

View File

@ -486,7 +486,7 @@ libc_arch_static_src_files := \
# ======================================================== # ========================================================
libc_common_cflags := \ libc_common_cflags := \
-D_LIBC=1 \ -D_LIBC=1 \
-Wall -Wextra \ -Wall -Wextra -Wunused \
# Try to catch typical 32-bit assumptions that break with 64-bit pointers. # Try to catch typical 32-bit assumptions that break with 64-bit pointers.
libc_common_cflags += \ libc_common_cflags += \
@ -709,7 +709,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libc_upstream_openbsd_src_files) LOCAL_SRC_FILES := $(libc_upstream_openbsd_src_files)
LOCAL_CFLAGS := \ LOCAL_CFLAGS := \
$(libc_common_cflags) \ $(libc_common_cflags) \
-Wno-sign-compare -Wno-uninitialized \ -Wno-sign-compare -Wno-uninitialized -Wno-unused-parameter \
-Werror \ -Werror \
-I$(LOCAL_PATH)/upstream-openbsd/android/include \ -I$(LOCAL_PATH)/upstream-openbsd/android/include \
-I$(LOCAL_PATH)/upstream-openbsd/lib/libc/include \ -I$(LOCAL_PATH)/upstream-openbsd/lib/libc/include \

View File

@ -94,7 +94,7 @@ __LIBC_HIDDEN__ void __libc_postfini() {
// Note that the dynamic linker has also run all constructors in the // Note that the dynamic linker has also run all constructors in the
// executable at this point. // executable at this point.
__noreturn void __libc_init(void* raw_args, __noreturn void __libc_init(void* raw_args,
void (*onexit)(void), void (*onexit)(void) __unused,
int (*slingshot)(int, char**, char**), int (*slingshot)(int, char**, char**),
structors_array_t const * const structors) { structors_array_t const * const structors) {

View File

@ -85,7 +85,7 @@ static void apply_gnu_relro() {
} }
__noreturn void __libc_init(void* raw_args, __noreturn void __libc_init(void* raw_args,
void (*onexit)(void), void (*onexit)(void) __unused,
int (*slingshot)(int, char**, char**), int (*slingshot)(int, char**, char**),
structors_array_t const * const structors) { structors_array_t const * const structors) {
KernelArgumentBlock args(raw_args); KernelArgumentBlock args(raw_args);

View File

@ -22,7 +22,7 @@ LOCAL_LDFLAGS_x86 := -Wl,--exclude-libs=libgcc_eh.a
LOCAL_LDFLAGS_x86_64 := $(LOCAL_LDFLAGS_x86) LOCAL_LDFLAGS_x86_64 := $(LOCAL_LDFLAGS_x86)
LOCAL_SRC_FILES:= libdl.c LOCAL_SRC_FILES:= libdl.c
LOCAL_CFLAGS := -Wall -Wextra -Werror LOCAL_CFLAGS := -Wall -Wextra -Wunused -Werror
LOCAL_MODULE := libdl LOCAL_MODULE := libdl
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

View File

@ -26,7 +26,7 @@ LOCAL_CFLAGS += \
-fno-stack-protector \ -fno-stack-protector \
-Wstrict-overflow=5 \ -Wstrict-overflow=5 \
-fvisibility=hidden \ -fvisibility=hidden \
-Wall -Wextra -Werror \ -Wall -Wextra -Wunused -Werror \
LOCAL_CONLYFLAGS += \ LOCAL_CONLYFLAGS += \
-std=gnu99 \ -std=gnu99 \

View File

@ -59,7 +59,6 @@ class LinkedList {
template<typename F> template<typename F>
void remove_if(F&& predicate) { void remove_if(F&& predicate) {
LinkedListEntry<T>* e = head_;
for (LinkedListEntry<T>* e = head_; e != nullptr; e = e->next) { for (LinkedListEntry<T>* e = head_; e != nullptr; e = e->next) {
if (e->element != nullptr && predicate(e->element)) { if (e->element != nullptr && predicate(e->element)) {
e->element = nullptr; e->element = nullptr;

View File

@ -827,7 +827,7 @@ void do_android_update_LD_LIBRARY_PATH(const char* ld_library_path) {
} }
} }
soinfo* do_dlopen(const char* name, int flags, soinfo* caller, const android_dlextinfo* extinfo) { soinfo* do_dlopen(const char* name, int flags, soinfo* /*caller*/, const android_dlextinfo* extinfo) {
if ((flags & ~(RTLD_NOW|RTLD_LAZY|RTLD_LOCAL|RTLD_GLOBAL|RTLD_NOLOAD)) != 0) { if ((flags & ~(RTLD_NOW|RTLD_LAZY|RTLD_LOCAL|RTLD_GLOBAL|RTLD_NOLOAD)) != 0) {
DL_ERR("invalid flags to dlopen: %x", flags); DL_ERR("invalid flags to dlopen: %x", flags);
return NULL; return NULL;

View File

@ -26,7 +26,7 @@ LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_CFLAGS += -g -Wall -Wextra -Werror -std=gnu++11 LOCAL_CFLAGS += -g -Wall -Wextra -Wunused -Werror -std=gnu++11
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../libc/ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../libc/
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \

View File

@ -34,7 +34,7 @@ endif
test_cflags = \ test_cflags = \
-fstack-protector-all \ -fstack-protector-all \
-g \ -g \
-Wall -Wextra \ -Wall -Wextra -Wunused \
-Werror \ -Werror \
-fno-builtin \ -fno-builtin \