Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afa10292 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Gerrit Code Review
Browse files

Merge "logcat: turn on -Werror"

parents 39f2ec2f b149e245

logcat/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ LOCAL_SHARED_LIBRARIES := liblog 


LOCAL_MODULE := logcat



LOCAL_CFLAGS := -Werror



include $(BUILD_EXECUTABLE)



include $(call first-makefiles-under,$(LOCAL_PATH))

logcat/logcat.cpp

+0 −3
Original line number Diff line number Diff line
@@ -496,9 +496,6 @@ int main(int argc, char **argv) 
                    android::g_logRotateSizeKBytes

                                = DEFAULT_LOG_ROTATE_SIZE_KBYTES;

                } else {

                    long logRotateSize;

                    char *lastDigit;



                    if (!isdigit(optarg[0])) {

                        fprintf(stderr,"Invalid parameter to -r\n");

                        android::show_help(argv[0]);

logcat/tests/logcat_test.cpp

+3 −3
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ TEST(logcat, get_) { 
    ASSERT_EQ(4, count);

}



static void caught_blocking(int signum)

static void caught_blocking(int /*signum*/)

{

    unsigned long long v = 0xDEADBEEFA55A0000ULL;
@@ -461,7 +461,7 @@ TEST(logcat, blocking) { 
    EXPECT_EQ(1, signals);

}



static void caught_blocking_tail(int signum)

static void caught_blocking_tail(int /*signum*/)

{

    unsigned long long v = 0xA55ADEADBEEF0000ULL;
@@ -532,7 +532,7 @@ TEST(logcat, blocking_tail) { 
    EXPECT_EQ(1, signals);

}



static void caught_blocking_clear(int signum)

static void caught_blocking_clear(int /*signum*/)

{

    unsigned long long v = 0xDEADBEEFA55C0000ULL;