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 27FB9C11F64 for ; Thu, 1 Jul 2021 06:21:12 +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 7D69861607 for ; Thu, 1 Jul 2021 06:21:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7D69861607 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 8C9D0832D2; Thu, 1 Jul 2021 08:17:35 +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="WSNFGeyc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F37EE832A2; Thu, 1 Jul 2021 08:17:14 +0200 (CEST) Received: from mail-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) (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 9F58F83285 for ; Thu, 1 Jul 2021 08:16:35 +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-qk1-x734.google.com with SMTP id f6so5069174qka.0 for ; Wed, 30 Jun 2021 23:16:35 -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=fTlBvCwnYLGgyeZZDeRHerktLYYYsXTyjUSF9JS1pyw=; b=WSNFGeycwgLwyVpxaPo0ruv20fAvA1ASOc/jAzbDHLmXI4vqsFLgo2PtJ+9baHX5fa Ub65u19lacDBIC7hUlSr1Nm0aq7EsbXyL9Q3EpQZSlrin5tdtqyYseXXgHbzU1UIyeNp aD3pMrNN6Ik113xPayeoiGHRXay0F22yIXslKtKdr5Yta4E+kHYznKJ8yovgvjWLRYgp 3iRslhNvz3pSQ+28GUuWqt+bV2lp5fmAeVgKf8pLBSAvKDTH49Eu5jmYens5AH11x5ZH NztXRXAnSOHG6Ge46WkFb6GetdfQUgfX+T1HSN1G64AQxxgzgJW0tuLROqW/1SLzj1m/ Yq8A== 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=fTlBvCwnYLGgyeZZDeRHerktLYYYsXTyjUSF9JS1pyw=; b=dogaX+BhCqfvSXLSR74tNjHF6Ticefbe0xVG62Ntlk924ulABNQo4HEPsk/SrB69u3 ehFvZ5foHeCjZ4JBXABiADltTVQtVOhp/4vCsYXPEOL1qrZzfgEDjyKGtx6cm0SXyzmW LMsr9UhLJpuMER5hR6D1ytSde+ZWkTXBNnAHHso1ttrBoZSVsDUsFcWelVlGFHIEmpkt 17V5H8dWAh5ytTntOqmuKdOWkTDtdxVGmTP3+ukZdylSNeA/gC/Al0Bwe8Nr1TeDS0/K XcPTb58yvENIWKLbuxAEb98W9Wx8phv+Bk271nLdfJLSidlYStma01ZIsSa8NySutRIy ArDw== X-Gm-Message-State: AOAM533pQpqcu0iVgKQXJVd6dc2dQ4dX+DM+ZUiMjQZwqAgaj7iwM+au RHHUH8NH2CYrdn5VVYrfg0mcgfPy2iM= X-Google-Smtp-Source: ABdhPJwBkKFgls3oPiC/BK3kIoc9eXtuY98stATkB5rNYAwMSgqVs0IgVHo3rv6Iv1BZVEj5FK6B1A== X-Received: by 2002:a37:64cf:: with SMTP id y198mr28791066qkb.498.1625120194382; Wed, 30 Jun 2021 23:16:34 -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.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jun 2021 23:16:34 -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 26/28] cli: lil: Allocate len even when str is NULL in alloc_value_len Date: Thu, 1 Jul 2021 02:16:09 -0400 Message-Id: <20210701061611.957918-27-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 allows us to reserve some space ahead of time, avoiding another alloc/copy/free. Signed-off-by: Sean Anderson --- common/cli_lil.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/common/cli_lil.c b/common/cli_lil.c index 153c34791b..42659920b5 100644 --- a/common/cli_lil.c +++ b/common/cli_lil.c @@ -459,21 +459,19 @@ static struct lil_value *alloc_value_len(const char *str, size_t len) if (!val) return NULL; value_to_symbol(val)->type = LIL_SYMBOL_VALUE; + ensure_capacity(val, len + 1); + if (!val->d) { + release_to_pool(val); + return NULL; + } if (str) { val->l = len; - ensure_capacity(val, len + 1); - if (!val->d) { - release_to_pool(val); - return NULL; - } memcpy(val->d, str, len); val->d[len] = 0; } else { val->l = 0; - ensure_capacity(val, 1); - if (val->d) - val->d[0] = '\0'; + val->d[0] = '\0'; } return val; } -- 2.32.0