From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 56F96C11F64 for ; Thu, 1 Jul 2021 06:19:27 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D0AB161425 for ; Thu, 1 Jul 2021 06:19:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D0AB161425 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 009AA83285; Thu, 1 Jul 2021 08:17:14 +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="WfAHrZL5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4575783297; Thu, 1 Jul 2021 08:16:53 +0200 (CEST) Received: from mail-qt1-x831.google.com (mail-qt1-x831.google.com [IPv6:2607:f8b0:4864:20::831]) (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 3F39C83250 for ; Thu, 1 Jul 2021 08:16:24 +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-x831.google.com with SMTP id v10so3373645qto.1 for ; Wed, 30 Jun 2021 23:16:24 -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=QdGwPqXb8bo4KMun/OlSVqGm//O5em/UfX5YVBSSr6M=; b=WfAHrZL5FCi2sDqDhpJQivinGS/3rO3yR2nfHQ/5kO0ray3Z5bRmFj8gZ2tXS9cPez FUdykQ2zN5wLIr5M+/krELZJNBOptjDBj8D0ovRnSLZ8m70ufSGNZWAfRbMLASHd77d8 VaSPY0br+05tSMoL99OXCPXHvUREYiM8K+1HPAAQOwwQsfPX3/WrjNjTj7bCdz8JzK4K XQ3qhzuI0FNGJpY/g3vRGMwINP5E4rya7HLDTpTCnQl7rAAGYPUHHUKA2KfnZcO2lkR8 8lm35niIvJaV9nLlT9vYGtsS8OyNerYL1pl+6PP7WU20OTPbilbbPV7K10URsbvzxPKh /MMQ== 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=QdGwPqXb8bo4KMun/OlSVqGm//O5em/UfX5YVBSSr6M=; b=JRV9G7MzVHRCl5YfsRGcEz4EWMABS4YPhC9FOwuyosRYZ+fwLRr7jYnPceeabV4wrX soyic4+fhl31XsdZHMpK92aiA538q110xmHD4Hbkjxs9CFqZG0XpThDjmcBYPNf9Y6mq KN5zPzQ4XIWsaKiZ4/OG1bjuVQrk9XtUG5KLNws2K1gojj9e8nZh3YTb5D2RMsfAr33Y HnhOwHEZYVq+OF9mrdcsTnAh87MeJLuOwaeD1qju7oFf7sz/1wVew9nUrJNDkm4EZM9z oojKC6u54Y4nPQ/GXNlnj+Em9F5xcYSsK081HYeYUWB9eeQpayXSPEmoZx2CICL4qADa mFzg== X-Gm-Message-State: AOAM530wuRJ3HhTHvyjY6QvK0BbNsuk8prV4AXvY4t8sl8oR3ydSqpb3 zm8yG9fkauxlOA3jTzXrs/3vBOBAC8U= X-Google-Smtp-Source: ABdhPJza6GR5VxjMo0ZUMxpDOUYVaaq29ysgUSUq6ZhjHUJ8jP2kkUB3fzLgyi9PmG692DdJOuc1QA== X-Received: by 2002:ac8:5cd5:: with SMTP id s21mr18540314qta.192.1625120182898; Wed, 30 Jun 2021 23:16:22 -0700 (PDT) Received: from godwin.fios-router.home (pool-74-96-87-9.washdc.fios.verizon.net. [74.96.87.9]) by smtp.gmail.com with ESMTPSA id g21sm1684673qts.90.2021.06.30.23.16.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jun 2021 23:16:22 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de, Tom Rini Cc: =?UTF-8?q?Marek=20Beh=C3=BAn?= , Wolfgang Denk , Simon Glass , Roland Gaudig , Heinrich Schuchardt , Kostas Michalopoulos , Sean Anderson Subject: [RFC PATCH 11/28] cli: lil: Add several helper functions for errors Date: Thu, 1 Jul 2021 02:15:54 -0400 Message-Id: <20210701061611.957918-12-seanga2@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210701061611.957918-1-seanga2@gmail.com> References: <20210701061611.957918-1-seanga2@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.103.2 at phobos.denx.de X-Virus-Status: Clean This adds several helper functions for common error types. This helps keep down code duplication, and also ensures that each of these errors uses the same message. Signed-off-by: Sean Anderson --- common/cli_lil.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/common/cli_lil.c b/common/cli_lil.c index f29c8065d8..c19a25b2bf 100644 --- a/common/cli_lil.c +++ b/common/cli_lil.c @@ -116,6 +116,9 @@ static void lil_set_error(struct lil *lil, enum lil_error err, const char *msg); static void lil_set_errorf(struct lil *lil, enum lil_error err, const char *fmt, ...) __attribute((format(__printf__, 3, 4))); +static void lil_set_error_oom(struct lil *lil); +static void lil_set_error_nocmd(struct lil *lil, const char *cmdname); +static void lil_set_error_intr(struct lil *lil); #ifdef LIL_ENABLE_POOLS static struct lil_value **pool; @@ -1124,9 +1127,8 @@ struct lil_value *lil_parse(struct lil *lil, const char *code, size_t codelen, if (!cmd) { if (words->v[0]->l) { - lil_set_errorf(lil, LIL_ERR_NOCMD, - "unknown function %s", - words->v[0]->d); + lil_set_error_nocmd(lil, + words->v[0]->d); goto cleanup; } } else { @@ -1204,6 +1206,33 @@ static void lil_set_errorf(struct lil *lil, enum lil_error err, va_end(saveargs); } +/* + * The next several functions provide helpers for throwing some formulaic + * errors. Their purpose is to ensure that the same wording is used everywhere + * the error is used. This reduces data size. + */ + +static void lil_set_error_oom(struct lil *lil) +{ + lil_set_error(lil, LIL_ERR_OOM, NULL); +} + +static void lil_set_error_argc(struct lil *lil, size_t expected) +{ + lil_set_errorf(lil, LIL_ERR_ARGC, "%s: expected %zu arguments", + lil->env->proc ?: lil->env->func->name, expected); +} + +static void lil_set_error_nocmd(struct lil *lil, const char *cmdname) +{ + lil_set_errorf(lil, LIL_ERR_NOCMD, "no such command %s", cmdname); +} + +static void lil_set_error_intr(struct lil *lil) +{ + lil_set_error(lil, LIL_ERR_INTR, "interrupted"); +} + enum lil_error lil_error(struct lil *lil, const char **msg) { enum lil_error err = lil->err; @@ -1992,8 +2021,7 @@ static struct lil_value *fnc_rename(struct lil *lil, size_t argc, newname = lil_to_string(argv[1]); func = lil_find_cmd(lil, oldname); if (!func) { - lil_set_errorf(lil, LIL_ERR_NOCMD, "unknown function %s", - oldname); + lil_set_error_nocmd(lil, oldname); return NULL; } -- 2.32.0