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

Merge "logwrapper: turn on -Werror"

Browse source
This commit is contained in:
Mark Salyzyn 2014-05-02 21:40:37 +00:00 • committed by Gerrit Code Review
commit 39f2ec2f81
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
logwrapper/Android.mk
View file

@ -11,6 +11,7 @@ LOCAL_SRC_FILES := logwrap.c
LOCAL_SHARED_LIBRARIES := libcutils liblog LOCAL_SHARED_LIBRARIES := libcutils liblog
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_CFLAGS := -Werror
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
# ======================================================== # ========================================================
@ -22,6 +23,7 @@ LOCAL_SHARED_LIBRARIES := libcutils liblog
LOCAL_WHOLE_STATIC_LIBRARIES := liblogwrap LOCAL_WHOLE_STATIC_LIBRARIES := liblogwrap
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_CFLAGS := -Werror
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
# ======================================================== # ========================================================
@ -31,4 +33,5 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES:= logwrapper.c LOCAL_SRC_FILES:= logwrapper.c
LOCAL_MODULE := logwrapper LOCAL_MODULE := logwrapper
LOCAL_STATIC_LIBRARIES := liblog liblogwrap libcutils LOCAL_STATIC_LIBRARIES := liblog liblogwrap libcutils
LOCAL_CFLAGS := -Werror
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

4
logwrapper/logwrap.c
View file

@ -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, static int add_line_to_linear_buf(struct beginning_buf *b_buf,
char *line, ssize_t line_len) char *line, ssize_t line_len)
{ {
size_t new_len;
char *new_buf;
int full = 0; int full = 0;
if ((line_len + b_buf->used_len) > b_buf->buf_size) { 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 free_len;
ssize_t needed_space; ssize_t needed_space;
char *new_buf;
int cnt; int cnt;
if (e_buf->buf == NULL) { 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 *line_start;
char c; char c;
int line_len;
int i; int i;
line_start = buf; line_start = buf;