From: Sean Anderson <seanga2@gmail.com>
To: u-boot@lists.denx.de
Subject: [PATCH v4 14/22] cmd: log: Split off log level parsing
Date: Tue, 27 Oct 2020 19:55:33 -0400 [thread overview]
Message-ID: <20201027235541.706077-15-seanga2@gmail.com> (raw)
In-Reply-To: <20201027235541.706077-1-seanga2@gmail.com>
Move parsing of log level into its own function so it can be re-used. This
also adds support for using log level names instead of just the integer
equivalent.
Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
(no changes since v2)
Changes in v2:
- Print an error message if the log level is invalid.
cmd/log.c | 29 +++++++++++++++++++++++------
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/cmd/log.c b/cmd/log.c
index 82e3a7b62f..651e50358c 100644
--- a/cmd/log.c
+++ b/cmd/log.c
@@ -11,23 +11,40 @@
static char log_fmt_chars[LOGF_COUNT] = "clFLfm";
+static enum log_level_t parse_log_level(char *const arg)
+{
+ enum log_level_t ret;
+ ulong level;
+
+ if (!strict_strtoul(arg, 10, &level)) {
+ if (level > _LOG_MAX_LEVEL) {
+ printf("Only log levels <= %d are supported\n",
+ _LOG_MAX_LEVEL);
+ return LOGL_NONE;
+ }
+ return level;
+ }
+
+ ret = log_get_level_by_name(arg);
+ if (ret == LOGL_NONE)
+ printf("Unknown log level \"%s\"\n", arg);
+ return ret;
+}
+
static int do_log_level(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[])
{
if (argc > 1) {
- long log_level = simple_strtol(argv[1], NULL, 10);
+ enum log_level_t log_level = parse_log_level(argv[1]);
- if (log_level < 0 || log_level > _LOG_MAX_LEVEL) {
- printf("Only log levels <= %d are supported\n",
- _LOG_MAX_LEVEL);
+ if (log_level == LOGL_NONE)
return CMD_RET_FAILURE;
- }
gd->default_log_level = log_level;
} else {
printf("Default log level: %d\n", gd->default_log_level);
}
- return 0;
+ return CMD_RET_SUCCESS;
}
static int do_log_format(struct cmd_tbl *cmdtp, int flag, int argc,
--
2.28.0
next prev parent reply other threads:[~2020-10-27 23:55 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-27 23:55 [PATCH v4 00/22] log: Add commands for manipulating filters Sean Anderson
2020-10-27 23:55 ` [PATCH v4 01/22] log: Fix missing negation of ENOMEM Sean Anderson
2020-10-30 18:46 ` Tom Rini
2020-10-27 23:55 ` [PATCH v4 02/22] log: Fix incorrect documentation of log_filter.cat_list Sean Anderson
2020-10-30 18:46 ` Tom Rini
2020-10-27 23:55 ` [PATCH v4 03/22] log: Add additional const qualifier to arrays Sean Anderson
2020-10-30 18:46 ` Tom Rini
2020-10-27 23:55 ` [PATCH v4 04/22] log: Use CONFIG_IS_ENABLED() for LOG_TEST Sean Anderson
2020-10-30 18:46 ` Tom Rini
2020-10-27 23:55 ` [PATCH v4 05/22] log: Expose some helper functions Sean Anderson
2020-10-30 18:47 ` Tom Rini
2020-10-27 23:55 ` [PATCH v4 06/22] log: Add function to create a filter with flags Sean Anderson
2020-10-30 18:47 ` Tom Rini
2020-10-27 23:55 ` [PATCH v4 07/22] log: Add filter flag to deny on match Sean Anderson
2020-10-30 18:47 ` Tom Rini
2020-10-27 23:55 ` [PATCH v4 08/22] test: log: Convert log_test from python to C Sean Anderson
2020-10-30 18:47 ` Tom Rini
2020-10-27 23:55 ` [PATCH v4 09/22] test: log: Give tests names instead of numbers Sean Anderson
2020-10-30 18:47 ` Tom Rini
2020-10-27 23:55 ` [PATCH v4 10/22] test: Add tests for LOGFF_DENY Sean Anderson
2020-10-30 18:47 ` Tom Rini
2020-10-27 23:55 ` [PATCH v4 11/22] log: Add filter flag to match greater than a log level Sean Anderson
2020-10-30 18:47 ` Tom Rini
2020-10-27 23:55 ` [PATCH v4 12/22] test: Add test for LOGFF_MIN Sean Anderson
2020-10-30 18:47 ` Tom Rini
2020-10-27 23:55 ` [PATCH v4 13/22] cmd: log: Use sub-commands for log Sean Anderson
2020-10-30 18:47 ` Tom Rini
2020-10-27 23:55 ` Sean Anderson [this message]
2020-10-30 18:47 ` [PATCH v4 14/22] cmd: log: Split off log level parsing Tom Rini
2020-10-27 23:55 ` [PATCH v4 15/22] cmd: log: Add commands to list categories and drivers Sean Anderson
2020-10-30 18:48 ` Tom Rini
2020-10-27 23:55 ` [PATCH v4 16/22] cmd: log: Make "log level" print all log levels Sean Anderson
2020-10-30 18:48 ` Tom Rini
2020-10-27 23:55 ` [PATCH v4 17/22] lib: Add getopt Sean Anderson
2020-10-30 18:48 ` Tom Rini
2020-10-27 23:55 ` [PATCH v4 18/22] test: Add a test for getopt Sean Anderson
2020-10-30 18:48 ` Tom Rini
2020-10-27 23:55 ` [PATCH v4 19/22] cmd: log: Add commands to manipulate filters Sean Anderson
2020-10-30 18:48 ` Tom Rini
2020-10-27 23:55 ` [PATCH v4 20/22] test: Add a test for log filter-* Sean Anderson
2020-10-30 18:48 ` Tom Rini
2020-10-27 23:55 ` [PATCH v4 21/22] doc: Add log kerneldocs to documentation Sean Anderson
2020-10-30 18:48 ` Tom Rini
2020-10-27 23:55 ` [PATCH v4 22/22] doc: Update logging documentation Sean Anderson
2020-10-30 18:48 ` Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201027235541.706077-15-seanga2@gmail.com \
--to=seanga2@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox