diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2023-06-12 13:36:13 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-06-12 14:29:59 +0200 |
| commit | 1baa83292b3b742e5c5dacff8b2c67ee62668184 (patch) | |
| tree | c1bc61f8d7af8b7b0f0ac8bf34603f7b5e0e6772 /commands | |
| parent | 7322616af39e3dde8783297a5c493311f23f5fd6 (diff) | |
| download | barebox-1baa83292b3b742e5c5dacff8b2c67ee62668184.tar.gz barebox-1baa83292b3b742e5c5dacff8b2c67ee62668184.tar.xz | |
dmesg: factor out str_to_loglevel()
dmesg open codes functionality to convert a string to a loglevel.
Make a separate function from it which will be useful in the next
patch.
While at it remove the BAREBOX_LOG_PRINT_* defines and use MSG_*
defines directly.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/dmesg.c | 47 |
1 files changed, 29 insertions, 18 deletions
diff --git a/commands/dmesg.c b/commands/dmesg.c index 15ad449639..339910bb76 100644 --- a/commands/dmesg.c +++ b/commands/dmesg.c @@ -11,6 +11,30 @@ #include <getopt.h> #include <clock.h> +static int str_to_loglevel(const char *str) +{ + if (!strcmp(str, "vdebug")) + return MSG_VDEBUG; + if (!strcmp(str, "debug")) + return MSG_DEBUG; + if (!strcmp(str, "info")) + return MSG_INFO; + if (!strcmp(str, "notice")) + return MSG_NOTICE; + if (!strcmp(str, "warn")) + return MSG_WARNING; + if (!strcmp(str, "err")) + return MSG_ERR; + if (!strcmp(str, "crit")) + return MSG_CRIT; + if (!strcmp(str, "alert")) + return MSG_ALERT; + if (!strcmp(str, "emerg")) + return MSG_EMERG; + + return -EINVAL; +} + static unsigned dmesg_get_levels(const char *__args) { char *args = xstrdup(__args); @@ -18,28 +42,15 @@ static unsigned dmesg_get_levels(const char *__args) unsigned flags = 0; while (1) { + int level; + str = strsep(&levels, ","); if (!str) break; - if(!strcmp(str, "vdebug")) - flags |= BAREBOX_LOG_PRINT_VDEBUG; - else if(!strcmp(str, "debug")) - flags |= BAREBOX_LOG_PRINT_DEBUG; - else if(!strcmp(str, "info")) - flags |= BAREBOX_LOG_PRINT_INFO; - else if(!strcmp(str, "notice")) - flags |= BAREBOX_LOG_PRINT_NOTICE; - else if(!strcmp(str, "warn")) - flags |= BAREBOX_LOG_PRINT_WARNING; - else if(!strcmp(str, "err")) - flags |= BAREBOX_LOG_PRINT_ERR; - else if(!strcmp(str, "crit")) - flags |= BAREBOX_LOG_PRINT_CRIT; - else if(!strcmp(str, "alert")) - flags |= BAREBOX_LOG_PRINT_ALERT; - else if(!strcmp(str, "emerg")) - flags |= BAREBOX_LOG_PRINT_EMERG; + level = str_to_loglevel(str); + if (level >= 0) + flags |= BIT(level); } free(args); |