diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-05-02 21:45:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-02 21:45:45 +0000 |
| commit | 3c742c9995ed4bf95ff5bfcfb373c1e94326b190 (patch) | |
| tree | d3260393dba5b00826d4328f970b69afd77f3a4f | |
| parent | 7669f1c8c447b4c66a6ad05c71bec27ff5ff3853 (diff) | |
| parent | 92c584740ec5a0df04bfab456e735db0302e5052 (diff) | |
| download | system_core-3c742c9995ed4bf95ff5bfcfb373c1e94326b190.zip system_core-3c742c9995ed4bf95ff5bfcfb373c1e94326b190.tar.gz system_core-3c742c9995ed4bf95ff5bfcfb373c1e94326b190.tar.bz2 | |
am 92c58474: am afa10292: Merge "logcat: turn on -Werror"
* commit '92c584740ec5a0df04bfab456e735db0302e5052':
logcat: turn on -Werror
| -rw-r--r-- | logcat/Android.mk | 4 | ||||
| -rw-r--r-- | logcat/logcat.cpp | 3 | ||||
| -rw-r--r-- | logcat/tests/logcat_test.cpp | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/logcat/Android.mk b/logcat/Android.mk index b5e27eb..f46a4de 100644 --- a/logcat/Android.mk +++ b/logcat/Android.mk @@ -7,7 +7,9 @@ LOCAL_SRC_FILES:= logcat.cpp event.logtags LOCAL_SHARED_LIBRARIES := liblog -LOCAL_MODULE:= logcat +LOCAL_MODULE := logcat + +LOCAL_CFLAGS := -Werror include $(BUILD_EXECUTABLE) diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp index 995a42e..41a4fae 100644 --- a/logcat/logcat.cpp +++ b/logcat/logcat.cpp @@ -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]); diff --git a/logcat/tests/logcat_test.cpp b/logcat/tests/logcat_test.cpp index b07cc8b..2e8ae8b 100644 --- a/logcat/tests/logcat_test.cpp +++ b/logcat/tests/logcat_test.cpp @@ -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; |