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=1.4 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,LIST_MIRROR_RECEIVED,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=no 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 554E61F852 for ; Fri, 4 Feb 2022 23:48:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348258AbiBDXsp (ORCPT ); Fri, 4 Feb 2022 18:48:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234597AbiBDXsp (ORCPT ); Fri, 4 Feb 2022 18:48:45 -0500 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA5B1E0090B1 for ; Fri, 4 Feb 2022 15:48:42 -0800 (PST) Received: by mail-wr1-x429.google.com with SMTP id f17so14082509wrx.1 for ; Fri, 04 Feb 2022 15:48:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7tSCnKlilEMtmbvfnJOSly7qrkNkrxedFOl38ZcdJlw=; b=jOcVKWV4aImq0NSh71alax2k5UyAcNLtz/H8tqu/Jw9c++jUmICXQgUjyA+0yGkFJa XjTi/cGZR7HI7cnmKx4Awpf2sCJdyEhDFr5XYoN2VTZt6JGybLOZDPUjV+Upcd06NyWB ONF4CuyKM+NJlakFS0YlEGdaYMhp4kOFa8gng8ZWvHrLoydBgPf336WWALMmroR8WA+v l68oRnTE37HFP4NuCZESVg1BxLXQhIzA8mKSJQXqcbqkDxWo6bbg0jv8jE62m9uQJ/8T hwc4JaYXE7IXK9+yBy7ooThH7KDhWpYaQiaOHJcRD9qMuez6JyVrhaulZ+9Qu4UDeJ3y csgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7tSCnKlilEMtmbvfnJOSly7qrkNkrxedFOl38ZcdJlw=; b=VyxhN65wAeJ0ij+KFo6kWnKK1aDCVzZp1NaCUgu1FwodG6n2+NgxPNnUZlo+kE9av2 I5gEw2ti3GFD73qorMV3tu2fmPL/MSOKgmxirwfGvvzXG3JLdexkVSGd4CbYQF0XwFAb aYlbuArfAD+mL7Hnw+GiNAITH4otd8WitHvp0Lo8YkHulCq4BYlXTzpy8hmvVms07w0Q JWUzF08fHpS0xCZjzYw3vanFlxTkiYvgb9clm4FcqjdZhXN/GVe5x8FbJr/r9/5ojFOg X9p0bJUF6FTSBYaSnEmyZspWFHKWWwbbyHl/XzLrIXohvb8FHn6zsXoBXXhONigpy63O 7f4Q== X-Gm-Message-State: AOAM5324aC8JTHCpsShjTkqZ1FaUGeR3q2G1wb/OEFnCF9fowM7ZakKp 7Pww+i0gFysu/4gwaLGCThEMhA+C5nbGSA== X-Google-Smtp-Source: ABdhPJwL1ghAPZJalO7q2/frofLQwsH3u85YhPKO8c7eGAz0paTVdhRPjsiC2GeAGPPnda0zOe6EZg== X-Received: by 2002:a5d:6dc5:: with SMTP id d5mr970034wrz.23.1644018521071; Fri, 04 Feb 2022 15:48:41 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id t16sm2724042wmq.21.2022.02.04.15.48.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 15:48:40 -0800 (PST) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: Junio C Hamano , Han Xin , Jiang Xin , =?UTF-8?q?Ren=C3=A9=20Scharfe?= , Derrick Stolee , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH v3 01/12] object-file.c: split up declaration of unrelated variables Date: Sat, 5 Feb 2022 00:48:23 +0100 Message-Id: X-Mailer: git-send-email 2.35.1.940.ge7a5b4b05f2 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 Split up the declaration of the "ret" and "re_allocated" variables. It's not our usual style to group variable declarations simply because they share a type, we'd only prefer to do so when the two are closely related (e.g. "int i, j"). This change makes a subsequent and meaningful change's diff smaller. Signed-off-by: Ævar Arnfjörð Bjarmason --- object-file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/object-file.c b/object-file.c index 8be57f48de7..ecc77973292 100644 --- a/object-file.c +++ b/object-file.c @@ -2118,7 +2118,8 @@ static int index_mem(struct index_state *istate, enum object_type type, const char *path, unsigned flags) { - int ret, re_allocated = 0; + int ret; + int re_allocated = 0; int write_object = flags & HASH_WRITE_OBJECT; if (!type) -- 2.35.1.940.ge7a5b4b05f2