From 5254c4a448c88bb0056eafe41cef03026a1ebb19 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Wed, 30 Apr 2014 09:04:25 -0700 Subject: logwrapper: turn on -Werror - Deal with some -Wunused / -Wunused-variable issues Change-Id: I27a99ffb962289ebbf04b40870b9404842030d2f --- logwrapper/Android.mk | 3 +++ logwrapper/logwrap.c | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/logwrapper/Android.mk b/logwrapper/Android.mk index 917bf37..61b4659 100644 --- a/logwrapper/Android.mk +++ b/logwrapper/Android.mk @@ -11,6 +11,7 @@ LOCAL_SRC_FILES := logwrap.c LOCAL_SHARED_LIBRARIES := libcutils liblog LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_C_INCLUDES := $(LOCAL_PATH)/include +LOCAL_CFLAGS := -Werror include $(BUILD_STATIC_LIBRARY) # ======================================================== @@ -22,6 +23,7 @@ LOCAL_SHARED_LIBRARIES := libcutils liblog LOCAL_WHOLE_STATIC_LIBRARIES := liblogwrap LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_C_INCLUDES := $(LOCAL_PATH)/include +LOCAL_CFLAGS := -Werror include $(BUILD_SHARED_LIBRARY) # ======================================================== @@ -31,4 +33,5 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES:= logwrapper.c LOCAL_MODULE := logwrapper LOCAL_STATIC_LIBRARIES := liblog liblogwrap libcutils +LOCAL_CFLAGS := -Werror include $(BUILD_EXECUTABLE) diff --git a/logwrapper/logwrap.c b/logwrapper/logwrap.c index 4ca1db4..d47c9b5 100644 --- a/logwrapper/logwrap.c +++ b/logwrapper/logwrap.c @@ -104,8 +104,6 @@ static void add_line_to_abbr_buf(struct abbr_buf *a_buf, char *linebuf, int line static int add_line_to_linear_buf(struct beginning_buf *b_buf, char *line, ssize_t line_len) { - size_t new_len; - char *new_buf; int full = 0; if ((line_len + b_buf->used_len) > b_buf->buf_size) { @@ -124,7 +122,6 @@ static void add_line_to_circular_buf(struct ending_buf *e_buf, { ssize_t free_len; ssize_t needed_space; - char *new_buf; int cnt; if (e_buf->buf == NULL) { @@ -192,7 +189,6 @@ static void print_buf_lines(struct log_info *log_info, char *buf, int buf_size) { char *line_start; char c; - int line_len; int i; line_start = buf; -- cgit v1.1