From: Sean Anderson <seanga2@gmail.com>
To: u-boot@lists.denx.de
Subject: [PATCH 12/18] cmd: log: Split off log level parsing
Date: Tue, 6 Oct 2020 15:16:04 -0400 [thread overview]
Message-ID: <20201006191610.761899-13-seanga2@gmail.com> (raw)
In-Reply-To: <20201006191610.761899-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>
---
cmd/log.c | 25 +++++++++++++++++++------
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/cmd/log.c b/cmd/log.c
index e55ace9e14..71bfdbbc0f 100644
--- a/cmd/log.c
+++ b/cmd/log.c
@@ -11,23 +11,36 @@
static char log_fmt_chars[LOGF_COUNT] = "clFLfm";
+static enum log_level_t parse_log_level(char *const arg)
+{
+ 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;
+ }
+
+ return log_get_level_by_name(arg);
+}
+
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-06 19:16 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-06 19:15 [PATCH 00/18] log: Add commands for manipulating filters Sean Anderson
2020-10-06 19:15 ` [PATCH 01/18] log: Fix missing negation of ENOMEM Sean Anderson
2020-10-06 20:36 ` Heinrich Schuchardt
2020-10-06 19:15 ` [PATCH 02/18] log: Fix incorrect documentation of log_filter.cat_list Sean Anderson
2020-10-06 20:41 ` Heinrich Schuchardt
2020-10-06 19:15 ` [PATCH 03/18] log: Add new category names to log_cat_name Sean Anderson
2020-10-06 20:45 ` Heinrich Schuchardt
2020-10-06 19:15 ` [PATCH 04/18] log: Use CONFIG_IS_ENABLED() for LOG_TEST Sean Anderson
2020-10-06 19:15 ` [PATCH 05/18] log: Expose log_device_find_by_name Sean Anderson
2020-10-06 19:15 ` [PATCH 06/18] log: Add function to create a filter with flags Sean Anderson
2020-10-06 19:15 ` [PATCH 07/18] log: Add filter flag to deny on match Sean Anderson
2020-10-06 19:16 ` [PATCH 08/18] test: Add tests for LOGFF_DENY Sean Anderson
2020-10-06 19:16 ` [PATCH 09/18] log: Add filter flag to match greater than a log level Sean Anderson
2020-10-06 19:16 ` [PATCH 10/18] test: Add test for LOGFF_MIN Sean Anderson
2020-10-06 19:16 ` [PATCH 11/18] cmd: log: Use sub-commands for log Sean Anderson
2020-10-06 19:16 ` Sean Anderson [this message]
2020-10-06 19:16 ` [PATCH 13/18] lib: Add getopt Sean Anderson
2020-10-06 19:16 ` [PATCH 14/18] test: Add a test for getopt Sean Anderson
2020-10-06 19:16 ` [PATCH 15/18] cmd: log: Add commands to manipulate filters Sean Anderson
2020-10-06 21:14 ` Heinrich Schuchardt
2020-10-06 21:51 ` Sean Anderson
2020-10-06 22:02 ` Simon Glass
2020-10-06 22:04 ` Sean Anderson
2020-10-06 19:16 ` [PATCH 16/18] test: py: Add a test for log filter-* Sean Anderson
2020-10-06 22:07 ` Simon Glass
2020-10-06 22:09 ` Sean Anderson
2020-10-06 19:16 ` [PATCH 17/18] doc: Add log kerneldocs to documentation Sean Anderson
2020-10-06 19:16 ` [PATCH 18/18] doc: Update logging documentation Sean Anderson
2020-10-06 20:34 ` Heinrich Schuchardt
2020-10-06 20:38 ` Sean Anderson
2020-10-06 21:28 ` Heinrich Schuchardt
2020-10-06 22:00 ` Sean Anderson
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=20201006191610.761899-13-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