diff options
Diffstat (limited to 'logcat')
| -rw-r--r-- | logcat/logcat.cpp | 13 | ||||
| -rw-r--r-- | logcat/tests/logcat_test.cpp | 25 |
2 files changed, 20 insertions, 18 deletions
diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp index 0f1badb15..115b1a365 100644 --- a/logcat/logcat.cpp +++ b/logcat/logcat.cpp @@ -16,6 +16,7 @@ #include "logcat.h" +#include <android-base/macros.h> #include <arpa/inet.h> #include <assert.h> #include <ctype.h> @@ -959,7 +960,7 @@ static int __logcat(android_logcat_context_internal* context) { case 't': got_t = true; mode |= ANDROID_LOG_RDONLY | ANDROID_LOG_NONBLOCK; - // FALLTHRU + FALLTHROUGH_INTENDED; case 'T': if (strspn(optarg, "0123456789") != strlen(optarg)) { char* cp = parseTime(tail_time, optarg); @@ -1009,7 +1010,7 @@ static int __logcat(android_logcat_context_internal* context) { getLogSize = true; break; } - // FALLTHRU + FALLTHROUGH_INTENDED; case 'G': { char* cp; @@ -1023,15 +1024,15 @@ static int __logcat(android_logcat_context_internal* context) { case 'g': case 'G': setLogSize *= 1024; - // FALLTHRU + FALLTHROUGH_INTENDED; case 'm': case 'M': setLogSize *= 1024; - // FALLTHRU + FALLTHROUGH_INTENDED; case 'k': case 'K': setLogSize *= 1024; - // FALLTHRU + FALLTHROUGH_INTENDED; case '\0': break; @@ -1051,7 +1052,7 @@ static int __logcat(android_logcat_context_internal* context) { getPruneList = true; break; } - // FALLTHRU + FALLTHROUGH_INTENDED; case 'P': setPruneList = optarg; diff --git a/logcat/tests/logcat_test.cpp b/logcat/tests/logcat_test.cpp index bebcc7192..9483bb2d5 100644 --- a/logcat/tests/logcat_test.cpp +++ b/logcat/tests/logcat_test.cpp @@ -31,6 +31,7 @@ #include <string> #include <android-base/file.h> +#include <android-base/macros.h> #include <android-base/stringprintf.h> #include <gtest/gtest.h> #include <log/event_tag_map.h> @@ -572,13 +573,13 @@ static int get_groups(const char* cmd) { switch (size_mult[0]) { case 'G': full_size *= 1024; - /* FALLTHRU */ + FALLTHROUGH_INTENDED; case 'M': full_size *= 1024; - /* FALLTHRU */ + FALLTHROUGH_INTENDED; case 'K': full_size *= 1024; - /* FALLTHRU */ + FALLTHROUGH_INTENDED; case 'B': break; default: @@ -588,13 +589,13 @@ static int get_groups(const char* cmd) { switch (consumed_mult[0]) { case 'G': full_consumed *= 1024; - /* FALLTHRU */ + FALLTHROUGH_INTENDED; case 'M': full_consumed *= 1024; - /* FALLTHRU */ + FALLTHROUGH_INTENDED; case 'K': full_consumed *= 1024; - /* FALLTHRU */ + FALLTHROUGH_INTENDED; case 'B': break; default: @@ -1241,26 +1242,26 @@ TEST(logcat, blocking_clear) { switch (size_mult[0]) { case 'G': full_size *= 1024; - /* FALLTHRU */ + FALLTHROUGH_INTENDED; case 'M': full_size *= 1024; - /* FALLTHRU */ + FALLTHROUGH_INTENDED; case 'K': full_size *= 1024; - /* FALLTHRU */ + FALLTHROUGH_INTENDED; case 'B': break; } switch (consumed_mult[0]) { case 'G': full_consumed *= 1024; - /* FALLTHRU */ + FALLTHROUGH_INTENDED; case 'M': full_consumed *= 1024; - /* FALLTHRU */ + FALLTHROUGH_INTENDED; case 'K': full_consumed *= 1024; - /* FALLTHRU */ + FALLTHROUGH_INTENDED; case 'B': break; } |