From patchwork Sat Oct 10 19:43:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1380113 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=iyUaDpcQ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C7wS52Yq7z9sSn for ; Sun, 11 Oct 2020 06:46:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A771182434; Sat, 10 Oct 2020 21:44:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="iyUaDpcQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 822F48240F; Sat, 10 Oct 2020 21:44:10 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-x843.google.com (mail-qt1-x843.google.com [IPv6:2607:f8b0:4864:20::843]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E484A823DE for ; Sat, 10 Oct 2020 21:44:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qt1-x843.google.com with SMTP id d1so10750508qtr.6 for ; Sat, 10 Oct 2020 12:44:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IxFPDLgS+1/OLIzVRwbTIgm2mm1MjAPvoUJMvLZoX4U=; b=iyUaDpcQgPUeR2gs2SgN68Lfx6UCAgTb2zK0VN6wK9U5k4n6KNsqeGmvZzvjdtc1Fb mbLXnMrZnrgs5OrEbzUf5NDKO1tvj4sHMVdsoUk3qzSEiHtj4JzHuKIClmpRhqPeu0nA gRXoMpMHEbt7mkU3tyou5J00tNIlvjp+7ZFkqRgKkdcXmOFvP37Zyo5A3qSHlZ2kKLs4 uzd9e4x1tULKZWkZ6cRTPN66ez/8UdEJc4LjBKZyAw5vKp4rM/pKLWxGL4lrJWERKm+l pPAtRXcg2cLZI9IgAl58DENdE7C0hqBjt9uSQNV7bHBoWQ15q5ttL9Zfl1fYRGujJb0V Jy1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IxFPDLgS+1/OLIzVRwbTIgm2mm1MjAPvoUJMvLZoX4U=; b=qCzY3Tj07H9GGvCJKlfGdO7TXVa+ejOTda0mAfNkkoA+JPUnjRe7I/9inuLHvI9YvH kl6L8u0EVfvpur+SOg0AjudKndIqfpdsXYfZztc0tLOmyvui4/pNx44LqiRRBtDguTeY apQGYVlY3mauAz/wZV1E7l27xcem/4SmKMQXd7xmW7hLeqzXi7Lb0mrqP55gLn8lUyh6 oy5aUbOOBOUKZyFT7i3cRRR4jd9RazZ+mmQJ8HVM4kb1SRn3IHKC4pytoieV0LRauIfw 7tmEftOYiYd+vSi00LiYoPu2ckTpyA19taibjLh+Q2oIe7i5NemSfOlEKUXC3UThtnih WCZg== X-Gm-Message-State: AOAM530TFWFm6qHAavbXTxrFFHl8QrMttd6ND3Bw7pGUaWP1AmRulXKM +YcpweviTrORaJBqUXUohvN/I19uDUW1kA== X-Google-Smtp-Source: ABdhPJzSipPIglHOcsLKYGPFAw4CLYgcaIcWfCz0GdydhxaNhMwwriHXmi4HZV6aS2U0noxc3u5r/A== X-Received: by 2002:ac8:2612:: with SMTP id u18mr3947111qtu.363.1602359045717; Sat, 10 Oct 2020 12:44:05 -0700 (PDT) Received: from godwin.fios-router.home (pool-108-51-35-162.washdc.fios.verizon.net. [108.51.35.162]) by smtp.gmail.com with ESMTPSA id h2sm5588376qkn.89.2020.10.10.12.44.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Oct 2020 12:44:05 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de Cc: Tom Rini , Heinrich Schuchardt , Simon Glass , Sean Anderson Subject: [PATCH v2 13/22] cmd: log: Split off log level parsing Date: Sat, 10 Oct 2020 15:43:38 -0400 Message-Id: <20201010194347.90096-14-seanga2@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201010194347.90096-1-seanga2@gmail.com> References: <20201010194347.90096-1-seanga2@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean 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 Reviewed-by: Simon Glass --- 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 e55ace9e14..5387aab551 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,