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

am afa10292: Merge "logcat: turn on -Werror"

Browse source 
* commit 'afa102924a97a8d2636d8c093565adcf34832e9a':
  logcat: turn on -Werror
This commit is contained in:
Mark Salyzyn 2014-05-02 21:43:17 +00:00 • committed by Android Git Automerger
commit 92c584740e
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
logcat/Android.mk
View file

@ -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)

3
logcat/logcat.cpp
View file

@ -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]);

6
logcat/tests/logcat_test.cpp
View file

@ -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;