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 4BF04C11F64 for ; Thu, 1 Jul 2021 06:18:17 +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 C5D7961424 for ; Thu, 1 Jul 2021 06:18:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C5D7961424 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 CB07F8324F; Thu, 1 Jul 2021 08:16:55 +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="GF8C0CE1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DCF3D8328C; Thu, 1 Jul 2021 08:16:40 +0200 (CEST) Received: from mail-qv1-xf2e.google.com (mail-qv1-xf2e.google.com [IPv6:2607:f8b0:4864:20::f2e]) (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 70F718323B for ; Thu, 1 Jul 2021 08:16:23 +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-qv1-xf2e.google.com with SMTP id p7so2428204qvn.5 for ; Wed, 30 Jun 2021 23:16:23 -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=Sw1eTFmTy3H5IZEH9k692+ZRdlrXYDZ3jaN41rUaqhM=; b=GF8C0CE1GP/Nrgrkb+Nhi1ycWU0n0Zx7mJXC1yem8XedaEtm7RziOFcvfNU5JEZ4Sy nBI+3A1poiHBOA9Js67DEM+NLK5kQ/ggXPksDDjcEPENyrrrFMsozQixNiflviFAoCri kbnxz7wu77uucAtu+D/5Izi3ivOVW+nikJnV9IrmTBS0J4WFinClq9fk5/tHE3e6LInX 0GQnLgAR7OjtPS/HMu+v2WXFnRFCYcw8PbJBQERjIh+ZRt5YhImkWwZh0B+Pe3q2gO5H zM8hd7Z2+8g+hKCIeDt8pdXdvWnMqn6SUqLgbPTG2lIVLUgYcmN8EmsOUtuRcgfwwA5b X8Iw== 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=Sw1eTFmTy3H5IZEH9k692+ZRdlrXYDZ3jaN41rUaqhM=; b=c9fGYmNJd+BL+wfrreI/j5hTlfjzO8/qe9O0uAFcMe1+tQ+TH+3umTAXBodgtFXq+2 qIR0BSlsFM3LNBSj8YgNV2vtyCm3stzyAg1Z1Vr5Sxitf6R4LxvK2b6ymzkTNviqi19M l9hQn1rLDoj1K6cODC2GOIgeZI0FJFOQESJeJF1rY6/LibNmOO9KZxMwx38f/gOf4Bme +EdmXx85myOpMxwusRKpnRFBDYAKaO+riY29SU/SwZwv4t6iI/visIA4dCMi7ETZ7TPC 5RPZlWBzN+GV5sfJZEBZKCBsScjciEThmjertcRZXwOued4+m2npWDTR8GddRdstnrzx 9OCg== X-Gm-Message-State: AOAM530F2ONW35db1AQ64XCXepp8MH1jqPh70SRadZg9QJRQ/d/Rc5q7 sYOE+nwzPJW+//ru29sE7oOO18MhZ6s= X-Google-Smtp-Source: ABdhPJzkLn0924+7DeFan4uV2p/vZQr5SUDw5RT18i6/cSXU2e+btR6aqc7YXpBTEdW+U4UWbKuieg== X-Received: by 2002:a05:6214:1a0f:: with SMTP id fh15mr9094931qvb.29.1625120182126; 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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jun 2021 23:16:21 -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 10/28] cli: lil: Add printf-style format helper for errors Date: Thu, 1 Jul 2021 02:15:53 -0400 Message-Id: <20210701061611.957918-11-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 a helper for dynamically-created error messages. Signed-off-by: Sean Anderson --- common/cli_lil.c | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/common/cli_lil.c b/common/cli_lil.c index 1bdf0e5265..f29c8065d8 100644 --- a/common/cli_lil.c +++ b/common/cli_lil.c @@ -113,6 +113,9 @@ struct expreval { static struct lil_value *next_word(struct lil *lil); static void register_stdcmds(struct lil *lil); 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))); #ifdef LIL_ENABLE_POOLS static struct lil_value **pool; @@ -1121,12 +1124,9 @@ struct lil_value *lil_parse(struct lil *lil, const char *code, size_t codelen, if (!cmd) { if (words->v[0]->l) { - char msg[64]; - - snprintf(msg, sizeof(msg), - "unknown function %s", - words->v[0]->d); - lil_set_error(lil, LIL_ERR_NOCMD, msg); + lil_set_errorf(lil, LIL_ERR_NOCMD, + "unknown function %s", + words->v[0]->d); goto cleanup; } } else { @@ -1180,6 +1180,30 @@ static void lil_set_error(struct lil *lil, enum lil_error err, const char *msg) lil->err_msg = strdup(msg); } +static void lil_set_errorf(struct lil *lil, enum lil_error err, + const char *fmt, ...) +{ + va_list args, saveargs; + size_t n; + + assert(!lil->err); + free(lil->err_msg); + lil->err = err; + + va_start(args, fmt); + va_copy(saveargs, args); + n = vsnprintf(NULL, 0, fmt, args) + 1; + va_end(args); + + lil->err_msg = calloc(1, n); + if (!lil->err_msg) { + lil->err = LIL_ERR_OOM; + return; + } + vsnprintf(lil->err_msg, n, fmt, saveargs); + va_end(saveargs); +} + enum lil_error lil_error(struct lil *lil, const char **msg) { enum lil_error err = lil->err; @@ -1968,11 +1992,8 @@ 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) { - char *msg = malloc(24 + strlen(oldname)); - - sprintf(msg, "unknown function '%s'", oldname); - lil_set_error(lil, LIL_ERR_NOCMD, msg); - free(msg); + lil_set_errorf(lil, LIL_ERR_NOCMD, "unknown function %s", + oldname); return NULL; } -- 2.32.0