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 613B3C11F64 for ; Thu, 1 Jul 2021 06:19:46 +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 0423F61490 for ; Thu, 1 Jul 2021 06:19:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0423F61490 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 F118D832A6; Thu, 1 Jul 2021 08:17:18 +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="Vbl1mX1h"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0605F83253; Thu, 1 Jul 2021 08:16:55 +0200 (CEST) Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) (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 78D8D8326B for ; Thu, 1 Jul 2021 08:16:29 +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-x736.google.com with SMTP id f6so5069004qka.0 for ; Wed, 30 Jun 2021 23:16:29 -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=LX6Bcoqpmn7XzMqEQXoZYWEJzkcheIM6tqexEWFToaw=; b=Vbl1mX1hsmTCln9hFj3ON80lsPb5JqitQpzCZoWfJ5H2anNtgFZeTROUFM8/p8J6NX wFaJLXUEb8XJbVbczyc/87W7bv/FOxiXJM3NhIs+seBsNC5jWE3eLTl+sIQYcBRQ+JP2 WgDPqKNySxalesNUS/Zw75gSl+FlNkFFBRzgGkPILE2XkjjW3GMYZfmuJnEWc/8pGGRI nFmVflXZo9fz3ohpbcctgM436qpPe+RbIKYW8VIpsEseyXP4EAE2KHJjfyxQ4VWR1BPA Qnslo/AsMRUt8f9ZtDQBYW1+DNbL2W/WF9yTbQVl2GZ5lB7soo91xd0GMFMF3P96O+0C 5IAw== 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=LX6Bcoqpmn7XzMqEQXoZYWEJzkcheIM6tqexEWFToaw=; b=tWmKC49/jdRqTP01bgCMrxTSferVr42CMDKyZKQoM5OFx3T5H7SX5OUAJfLcHZ9teO lxcjw/TkPq3XL0XY6f4RR9edbKJ23yD6lvSWWt2UAOtnIv6NbcHF3m9pnjR62Bb968Op +wnxkqRAsL/YuVAgbeECYOjJuKoVWxzdP4svWAcYyjeGKDXshCCO9+o7Bt1UW3j+JFOo 4eQkoZtS+BXBtCFM+ZX07okMnExrfWIVS2haJBXL5kKD2jWD6Q+SOMuozQCrebh5IamZ tP4+qUwIdIHq9gUiuys+/NLBSqquI7IU+wJA+XgaDguF5mT1uWFsIHeBzzycPRvSAxcw njNg== X-Gm-Message-State: AOAM530xuI68gOHR6F2HxGy3ZuAnN9XXf5ZEisnkKJMxbLSTCny3AMmG c/xPCfhNdQVhfSZ7HLRLoBKynDvXDCQ= X-Google-Smtp-Source: ABdhPJxQuNxfs9NsDrzwNRdS+/BOFSaynq19qG3TL6r3FJGJr1TYnaIfuS835DBom1Bd/a00s8jL9Q== X-Received: by 2002:a37:b143:: with SMTP id a64mr40651809qkf.492.1625120188162; Wed, 30 Jun 2021 23:16:28 -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.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jun 2021 23:16:27 -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 18/28] cli: lil: Remove duplicate function bodies Date: Thu, 1 Jul 2021 02:16:01 -0400 Message-Id: <20210701061611.957918-19-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 lil_append_val is just lil_append_string with the string and length taken from a struct lil_value. Use lil_append_stringh_len to implement both. Do the same for lil_clone_value. Signed-off-by: Sean Anderson --- common/cli_lil.c | 51 ++---------------------------------------------- 1 file changed, 2 insertions(+), 49 deletions(-) diff --git a/common/cli_lil.c b/common/cli_lil.c index 6c05531441..5875fbd46b 100644 --- a/common/cli_lil.c +++ b/common/cli_lil.c @@ -369,39 +369,7 @@ static struct lil_value *alloc_value(const char *str) struct lil_value *lil_clone_value(struct lil_value *src) { - struct lil_value *val; - - if (!src) - return NULL; - - if (IS_ENABLED(CONFIG_LIL_POOLS)) - val = alloc_from_pool(); - else - val = calloc(1, sizeof(struct lil_value)); - if (!val) - return NULL; - - val->l = src->l; - if (src->l) { - if (IS_ENABLED(CONFIG_LIL_POOLS)) { - ensure_capacity(val, val->l + 1); - } else { - val->d = malloc(val->l + 1); - if (!val->d) { - free(val); - return NULL; - } - } - memcpy(val->d, src->d, val->l + 1); - } else { - if (IS_ENABLED(CONFIG_LIL_POOLS)) { - ensure_capacity(val, 1); - val->d[0] = '\0'; - } else { - val->d = NULL; - } - } - return val; + return alloc_value_len(src->d, src->l); } int lil_append_char(struct lil_value *val, char ch) @@ -450,22 +418,7 @@ int lil_append_string(struct lil_value *val, const char *s) int lil_append_val(struct lil_value *val, struct lil_value *v) { - if (!v || !v->l) - return 1; - - if (IS_ENABLED(CONFIG_LIL_POOLS)) { - ensure_capacity(val, val->l + v->l + 1); - memcpy(val->d + val->l, v->d, v->l + 1); - } else { - char *new = realloc(val->d, val->l + v->l + 1); - - if (!new) - return 0; - memcpy(new + val->l, v->d, v->l + 1); - val->d = new; - } - val->l += v->l; - return 1; + return lil_append_string_len(val, v->d, v->l); } void lil_free_value(struct lil_value *val) -- 2.32.0