From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-2.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,UNWANTED_LANGUAGE_BODY shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id 1CBB31F54E for ; Sun, 21 Aug 2022 13:59:53 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WqprT+uB"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230488AbiHUN7N (ORCPT ); Sun, 21 Aug 2022 09:59:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230440AbiHUN6p (ORCPT ); Sun, 21 Aug 2022 09:58:45 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D85517058 for ; Sun, 21 Aug 2022 06:58:41 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id bs25so10300156wrb.2 for ; Sun, 21 Aug 2022 06:58:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=QcF0k+7hSaB899OyvlOfZqH+MgbAnK8B6coZoKwPuuc=; b=WqprT+uBiLP78O/yzjs+169RkofjBHGj7xZlLRs1qLw/eBqMaw33PobGPoawTWEf72 4LyekNh3NpUciSvQdbQSBNzRlEJNfySNPxg0gx71IET4YJtzKYO945EtY0xZP2w9sciJ 8fiDb8Btld8Um7IbNYuXKFN1oBMYZUsUXyVccauX0mqhmrMkFYqtyRcj9bXpYzYZ0JS1 hB5TPOW64Qoy9fDCO6MPMUeKjNMKT7wRgv26TIAjqYdgXLUr6lcLUcGLZGXUvdstBCJX CwE1JTJXgOYZXd7Nj8YaPnXM2mJmDrNSyywcLVGv8ocVqEPxrMkVKHWVdpIvO+53T79y 57mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=QcF0k+7hSaB899OyvlOfZqH+MgbAnK8B6coZoKwPuuc=; b=Anqg3X+ICXUDrIdvMOCgROnBqVg4PZbrD7izpryPZblf4G/vJsC+PiTtR2894uRm83 ul3TDGVGipT3iuhnGul7rID/RQowyQnOiJm6AeGT8qAXABfSHxcAPLrgoJXtDTd5zvjx f6c0YOOEbCwDH8Wcf6xQ2QZ7zN84awDcY+fw9OH+CeT3rE1xuwQHta/ZjflQ0dT//DvZ DSku/cgfbmMiBkoBRw86AetoqqiK8BS4XzgNcZrPfHAeMKTda0HnkMGsjJVesmi/UfCW q/leI/PKrNPizzEfthuaYWQD9ZDhBKaaAvhQMiRabt4i6ZVKYF5yZ+5ZB8IDi+GUFzVX QuKw== X-Gm-Message-State: ACgBeo1hOuBcneu6CIAZD/6zg3zOajKpiBa25JxAEOkYt+hl3N/GNb+t LrnSFCx2hjlJc1vZsoH4BV+l1UjztBxj0n4U X-Google-Smtp-Source: AA6agR70j+idxjLhO09mx+7nkaGE2g9djxhKJGlBXJlYq6YY3c0cGrhvn3HCMrl8dZ2flKGX8DmXEA== X-Received: by 2002:adf:f88c:0:b0:225:4c23:6788 with SMTP id u12-20020adff88c000000b002254c236788mr2792972wrp.140.1661090319079; Sun, 21 Aug 2022 06:58:39 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id o12-20020a05600c4fcc00b003a5b788993csm12624872wmq.42.2022.08.21.06.58.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Aug 2022 06:58:38 -0700 (PDT) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: Junio C Hamano , Glen Choo , Atharva Raykar , Prathamesh Chavan , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH v3 13/32] submodule--helper: move "sb" in clone_submodule() to its own scope Date: Sun, 21 Aug 2022 15:57:22 +0200 Message-Id: X-Mailer: git-send-email 2.37.2.1279.g64dec4e13cf In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Refactor the only remaining use of a "struct strbuf sb" in clone_submodule() to live in its own scope. This makes the code clearer by limiting its lifetime. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/submodule--helper.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index c7833bae81e..2f1f0e1bf34 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -1560,16 +1560,24 @@ static void prepare_possible_alternates(const char *sm_name, free(error_strategy); } -static int clone_submodule(struct module_clone_data *clone_data) +static char *clone_submodule_sm_gitdir(const char *name) { - char *p, *sm_gitdir; - char *sm_alternate = NULL, *error_strategy = NULL; struct strbuf sb = STRBUF_INIT; - struct child_process cp = CHILD_PROCESS_INIT; + char *sm_gitdir; - submodule_name_to_gitdir(&sb, the_repository, clone_data->name); + submodule_name_to_gitdir(&sb, the_repository, name); sm_gitdir = absolute_pathdup(sb.buf); - strbuf_reset(&sb); + strbuf_release(&sb); + + return sm_gitdir; +} + +static int clone_submodule(struct module_clone_data *clone_data) +{ + char *p; + char *sm_gitdir = clone_submodule_sm_gitdir(clone_data->name); + char *sm_alternate = NULL, *error_strategy = NULL; + struct child_process cp = CHILD_PROCESS_INIT; if (!is_absolute_path(clone_data->path)) clone_data->path = xstrfmt("%s/%s", get_git_work_tree(), @@ -1658,7 +1666,6 @@ static int clone_submodule(struct module_clone_data *clone_data) free(sm_alternate); free(error_strategy); - strbuf_release(&sb); free(sm_gitdir); free(p); return 0; -- 2.37.2.1279.g64dec4e13cf