From 9cfd1c6ebc613830ce8c0f427a3c3e53dfc7f34f Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Wed, 6 Jul 2016 11:12:14 -0700 Subject: [PATCH] logcat: format verbs and adverbs Bug: 29916087 Change-Id: I039c95b9dc0aa88f1219121513899934381453ae --- include/log/logprint.h | 3 ++- logcat/logcat.cpp | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/log/logprint.h b/include/log/logprint.h index 539d1dcff..1bc1f7241 100644 --- a/include/log/logprint.h +++ b/include/log/logprint.h @@ -27,6 +27,7 @@ extern "C" { #endif typedef enum { + /* Verbs */ FORMAT_OFF = 0, FORMAT_BRIEF, FORMAT_PROCESS, @@ -36,7 +37,7 @@ typedef enum { FORMAT_TIME, FORMAT_THREADTIME, FORMAT_LONG, - /* The following are modifiers to above formats */ + /* Adverbs. The following are modifiers to above format verbs */ FORMAT_MODIFIER_COLOR, /* converts priority to color */ FORMAT_MODIFIER_TIME_USEC, /* switches from msec to usec time precision */ FORMAT_MODIFIER_PRINTABLE, /* converts non-printable to printable escapes */ diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp index ea698c8da..f5604915e 100644 --- a/logcat/logcat.cpp +++ b/logcat/logcat.cpp @@ -285,9 +285,10 @@ static void show_help(const char *cmd) " -n , --rotate-count=\n" " Sets max number of rotated logs to , default 4\n" " -v , --format=\n" - " Sets the log print format, where is:\n" - " brief color epoch long monotonic printable process raw\n" - " tag thread threadtime time uid usec UTC year zone\n" + " Sets log print format verb and adverbs, where is:\n" + " brief long process raw tag thread theadtime time\n" + " and modifying adverbs can be:\n" + " color epoch monotonic printable uid usec UTC year zone\n" " -D, --dividers Print dividers between each log buffer\n" " -c, --clear Clear (flush) the entire log and exit\n" " if Log to File specified, clear fileset instead\n"