From patchwork Fri Nov 19 20:26:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12629519 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8CF84C433EF for ; Fri, 19 Nov 2021 20:26:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6D87661B27 for ; Fri, 19 Nov 2021 20:26:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233297AbhKSU3c (ORCPT ); Fri, 19 Nov 2021 15:29:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232048AbhKSU3c (ORCPT ); Fri, 19 Nov 2021 15:29:32 -0500 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 121DAC061574 for ; Fri, 19 Nov 2021 12:26:30 -0800 (PST) Received: by mail-wm1-x32a.google.com with SMTP id n33-20020a05600c502100b0032fb900951eso11376306wmr.4 for ; Fri, 19 Nov 2021 12:26:29 -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=CUTyVAh89CaSp2qVj80mPs0V07IA8jfB/iHDJsH8/1M=; b=ZQ4EgA+r6+5GEvehQTLqpLTN5aQd88nBzdPSdohNs9OqNGLNlBd8l+OhVZiGJcFnNr YR7iMSKTYQRDFewUhxFeTevzehH/v2YyaFVvYQ1K97rIcrl1Lqm7CYYZJKIsRbGuwQAK U5HmgZATctPapOhuTzDDwuf08zyfc9//BU2JCEybCmMO4ChZI5aGGDJa4svNnPVaCG5u 6g87cV05vX0GBuWTXmy6hsGIieJoTjkHl/Wg9t8wBrFnzDTfmU0R3vcM8i0fg6R41fX5 9PKlMhe+/n4n43tppv/GJfJGIE1pfCAk4PkkvZscw6jlbw5ol6Mc5IwrreHT9F1ZZFU/ 3xkw== 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=CUTyVAh89CaSp2qVj80mPs0V07IA8jfB/iHDJsH8/1M=; b=shQQ0sI6EwO8iumBHs0YBxK9dJUlzLIKeJGhlC60TQ4wS0DdbiEEs10vaRDlaxUMG5 gebG0kwQYC1m/Q3El+i3/BMGFrlx9MqGW5So6uDFnfwsNEQ5O/l5kRhBOrhlUZ25lCkr 4du6wGuOUcQELwfI/mWgTkMWFoSrTIdTdiLmelil//gGDdTSlK0vW0wLnaZLrpkgBO4i NqdNuEUp9qNdbt8ngf5X3UaU06tcRP/72zZ3w6HHHlEXBjwf0ktl06KY2nWUH9k/KEvv DwK8hnbuJKjuwIKymLTaUJX0zsDOGg1yrKayrPw2/UgEkuUFs8c738FiJj5jGUqTJscg nXGw== X-Gm-Message-State: AOAM533Mopq1NNRj3Ns7WKbwrc70Eb0qCeiAPRJLrsNb60hftEzBsEe0 GKnEV4xyUXNrHdmj+ZiTpGC6nm4vfrgLEQ== X-Google-Smtp-Source: ABdhPJxmlhxk7bzLY4kd0feTAkU8EFrrMEgLuREXkvaBIb8mPjmDu4/dirGRKzcpGx7/0mKmxzik9A== X-Received: by 2002:a05:600c:19cc:: with SMTP id u12mr3185820wmq.24.1637353588424; Fri, 19 Nov 2021 12:26:28 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id bg14sm856202wmb.5.2021.11.19.12.26.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Nov 2021 12:26:27 -0800 (PST) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH v2 1/5] xdiff/xmacros.h: remove unused XDL_PTRFREE Date: Fri, 19 Nov 2021 21:26:21 +0100 Message-Id: X-Mailer: git-send-email 2.34.0.823.gcc3243ae16c In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This macro was added in 3443546f6ef (Use a *real* built-in diff generator, 2006-03-24), but none of the xdiff code uses it, it uses xdl_free() directly. If we need its functionality again we'll use the FREE_AND_NULL() macro added in 481df65f4f7 (git-compat-util: add a FREE_AND_NULL() wrapper around free(ptr); ptr = NULL, 2017-06-15). Signed-off-by: Ævar Arnfjörð Bjarmason --- xdiff/xmacros.h | 1 - 1 file changed, 1 deletion(-) diff --git a/xdiff/xmacros.h b/xdiff/xmacros.h index 2809a28ca96..ae4636c2477 100644 --- a/xdiff/xmacros.h +++ b/xdiff/xmacros.h @@ -34,7 +34,6 @@ #define XDL_ADDBITS(v,b) ((v) + ((v) >> (b))) #define XDL_MASKBITS(b) ((1UL << (b)) - 1) #define XDL_HASHLONG(v,b) (XDL_ADDBITS((unsigned long)(v), b) & XDL_MASKBITS(b)) -#define XDL_PTRFREE(p) do { if (p) { xdl_free(p); (p) = NULL; } } while (0) #define XDL_LE32_PUT(p, v) \ do { \ unsigned char *__p = (unsigned char *) (p); \ From patchwork Fri Nov 19 20:26:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12629521 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 09726C4332F for ; Fri, 19 Nov 2021 20:26:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D653E61B39 for ; Fri, 19 Nov 2021 20:26:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234338AbhKSU3e (ORCPT ); Fri, 19 Nov 2021 15:29:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232048AbhKSU3d (ORCPT ); Fri, 19 Nov 2021 15:29:33 -0500 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ECB38C061574 for ; Fri, 19 Nov 2021 12:26:30 -0800 (PST) Received: by mail-wm1-x32d.google.com with SMTP id n33-20020a05600c502100b0032fb900951eso11376334wmr.4 for ; Fri, 19 Nov 2021 12:26:30 -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=+fXHDkEJAyOLyq4z+kpsAhVP9UO1z7EHqLXgH2Woa+A=; b=jmaZDEzZg+VtHd/2TmHCEPHc+zboJVLonKSLAFzX5DKUje0rRLwAdJr8OJdQ1m2jp6 aTzeJNeOVcH/Yr9ISZLi5DeM3SfCvh2sXhOYZErnNoZg4E2WlsaNJfjoQyBXQ4zQlEpf Wvtd0CaMm6a5UneDkD57GBYPg4aNWyaYkqwfs2pAjpMQ4sOzX77KD4fgiStjyaWDi8U5 ujakuU53KcVc+o3T/+JP8IRo5DK7D+PQx+MVEUY26zeXb3r2Y3NxgbX8xBaPw0AHXSAt dLXJTLUF3m+CcyQ+glEIs/U+Y/lNskTPyFVoAPO/bLAlaPJzMnVKvoTbVHnaFtZ+tPkv Jjyg== 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=+fXHDkEJAyOLyq4z+kpsAhVP9UO1z7EHqLXgH2Woa+A=; b=KqvbdBzvPkIhwQyBlCA+xWwa/w13PEbFXoiyvo7GdkgaYhMyDL1q98Zocr/gl8tsWJ /1uzRUbCgxyEzpjtfGi/plFDcV0Rg3xR1ki1V2R+fnUHYB/EuB+NaRZMstkCCJ0B4LFF yMCQgoRl5sBfpByhRbHdymTgblEEvJ9XpFP8rS0Xw/KbXOrw5RS0H7MzDcbzZBL7FAiD 2bUIT6gAVtlPupcCjhN4H6ea8NfV+c0Koc4rZ1RwgOTrng4giw5vOhXSm7cpIrVVITqv jxNX4N6/mlRb53RJ4zPhK4IwfUJjI+AybAXR04xAKiklTC/1MvEgxt/+sf/83V7EaEMU yfyg== X-Gm-Message-State: AOAM531x7UAqLn878DHfjqUzD07uSveD/SbAdsEI2dAwI63Po/sD0dDT BU84LQ0ZdWwg10p4rOctOcMV8gwZmBgrbA== X-Google-Smtp-Source: ABdhPJyi/FA3o7vsUBGo5nfaXc3evHfof5LNTyptf5w1fwopMgbTlNCEPOyQzqjKbAFV6f2AOLR+Nw== X-Received: by 2002:a05:600c:2195:: with SMTP id e21mr3146898wme.187.1637353589250; Fri, 19 Nov 2021 12:26:29 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id bg14sm856202wmb.5.2021.11.19.12.26.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Nov 2021 12:26:28 -0800 (PST) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH v2 2/5] pack-bitmap-write: remove unused bitmap_reset() function Date: Fri, 19 Nov 2021 21:26:22 +0100 Message-Id: X-Mailer: git-send-email 2.34.0.823.gcc3243ae16c In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This function hasn't been used since 449fa5ee069 (pack-bitmap-write: ignore BITMAP_FLAG_REUSE, 2020-12-08), which was a cleanup commit intending to get rid of the code around the reusing of bitmaps. Signed-off-by: Ævar Arnfjörð Bjarmason --- ewah/bitmap.c | 5 ----- ewah/ewok.h | 1 - 2 files changed, 6 deletions(-) diff --git a/ewah/bitmap.c b/ewah/bitmap.c index 38a47c44db4..87d5cc8fa30 100644 --- a/ewah/bitmap.c +++ b/ewah/bitmap.c @@ -216,11 +216,6 @@ int bitmap_is_subset(struct bitmap *self, struct bitmap *other) return 0; } -void bitmap_reset(struct bitmap *bitmap) -{ - memset(bitmap->words, 0x0, bitmap->word_alloc * sizeof(eword_t)); -} - void bitmap_free(struct bitmap *bitmap) { if (bitmap == NULL) diff --git a/ewah/ewok.h b/ewah/ewok.h index 66920965da1..7eb8b9b6301 100644 --- a/ewah/ewok.h +++ b/ewah/ewok.h @@ -177,7 +177,6 @@ struct bitmap *bitmap_dup(const struct bitmap *src); void bitmap_set(struct bitmap *self, size_t pos); void bitmap_unset(struct bitmap *self, size_t pos); int bitmap_get(struct bitmap *self, size_t pos); -void bitmap_reset(struct bitmap *self); void bitmap_free(struct bitmap *self); int bitmap_equals(struct bitmap *self, struct bitmap *other); int bitmap_is_subset(struct bitmap *self, struct bitmap *other); From patchwork Fri Nov 19 20:26:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12629527 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 19B17C433FE for ; Fri, 19 Nov 2021 20:26:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ED7FE61AA2 for ; Fri, 19 Nov 2021 20:26:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235280AbhKSU3k (ORCPT ); Fri, 19 Nov 2021 15:29:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234627AbhKSU3e (ORCPT ); Fri, 19 Nov 2021 15:29:34 -0500 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81F21C061574 for ; Fri, 19 Nov 2021 12:26:32 -0800 (PST) Received: by mail-wr1-x42f.google.com with SMTP id c4so20063834wrd.9 for ; Fri, 19 Nov 2021 12:26:32 -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=L0QyslBvJy5fQX2Yb6x4EkVSsmx8yIk+5/XY2SyqadY=; b=QzcNWmrTCOVR0H+Q7DWZPxxhCWcjANqtfRPk4LUoiN5XraUtkjKetrYpKBAq3WHeGV nqo6QJIyJ0khRZBktlPPM2RnwgK7nn+bHmusTt8J2iIWDobkrFKxk1Ch0eexhqRI5TeD l+mEiKgvneCsm1M/YhZioJyY6ly4uB8QwPnO3xrpgewmZhk9RYJzOho2q64naJz/MeJI zkbuW/dl3JgToSMl+f7HHsIFnLI6JQgfKZtvUiYHd72XZ2R1OiGRpi0Aj6+CFTRCR/hy qHx9WMtveDipBBiAI9VFHqfeMtBXB0CiOx4m9d6BWTdTv4ObNWvTOCLTS+Q04v3i2v5G DmNg== 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=L0QyslBvJy5fQX2Yb6x4EkVSsmx8yIk+5/XY2SyqadY=; b=8CcvRQ1x10HjgxrKb3cDnHer344zA5Ejsd05PobfoyxvCCiZgiRPqGnGkaxFQMQTCd CICAXf6xfBcmtOhpFfRNaxjg7349HHA7hnL7IMzTuy0WkS7F8yr+jTuY3CavczLmsa/Z ubw9GK9qbYCge560FZvzE1DZG/xKJ+fVorXPu/pbROcPsqrtzndnGPL+kf3NJtVGOSFb 25afltgcXjDvgBpJiWsJ71TrHfZND8iXPCzj5GsiHWjs5RbW0RmqgoAZJHYoI6PeYJux zJs8i+fN1zw9GyVDWOaGPKFHdTU/QTdYdA4dNaHrnkjcBOlWFeOBfKqPv1/IBoW8x5R+ 2LLg== X-Gm-Message-State: AOAM532XTNUmKMccVhm0UuSsdYzc6xNTWirmq9FKXudPFHF+mLBphpk1 JakbzmHjrGLksmgjfYp+3hWSs3qQWAgh5Q== X-Google-Smtp-Source: ABdhPJytKNXOUq9fsNK0PMndAkfevcEX37DwX7KvpDzg9fHq6EU1fVUVPEdtgyzBcQkCyqLUUOzUpg== X-Received: by 2002:a5d:64af:: with SMTP id m15mr11042157wrp.267.1637353590144; Fri, 19 Nov 2021 12:26:30 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id bg14sm856202wmb.5.2021.11.19.12.26.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Nov 2021 12:26:29 -0800 (PST) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH v2 3/5] object-store.h: remove unused has_sha1_file*() Date: Fri, 19 Nov 2021 21:26:23 +0100 Message-Id: X-Mailer: git-send-email 2.34.0.823.gcc3243ae16c In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org These macros were last used in 5d3679ee023 (sha1-file: drop has_sha1_file(), 2019-01-07), so let's remove coccinelle migration rules added 9b45f499818 (object-store: prepare has_{sha1, object}_file to handle any repo, 2018-11-13), along with the compatibility macros themselves. The "These functions.." in the diff context and the general comment about compatibility macros still applies to "NO_THE_REPOSITORY_COMPATIBILITY_MACROS" use just a few lines below this, so let's keep the comment. Signed-off-by: Ævar Arnfjörð Bjarmason --- contrib/coccinelle/the_repository.pending.cocci | 15 --------------- object-store.h | 4 ---- 2 files changed, 19 deletions(-) diff --git a/contrib/coccinelle/the_repository.pending.cocci b/contrib/coccinelle/the_repository.pending.cocci index 2ee702ecf7f..072ea0d9228 100644 --- a/contrib/coccinelle/the_repository.pending.cocci +++ b/contrib/coccinelle/the_repository.pending.cocci @@ -11,21 +11,6 @@ expression G; + repo_read_object_file(the_repository, E, F, G) -@@ -expression E; -@@ -- has_sha1_file( -+ repo_has_sha1_file(the_repository, - E) - -@@ -expression E; -expression F; -@@ -- has_sha1_file_with_flags( -+ repo_has_sha1_file_with_flags(the_repository, - E) - @@ expression E; @@ diff --git a/object-store.h b/object-store.h index 952efb6a4be..1717f73eea3 100644 --- a/object-store.h +++ b/object-store.h @@ -286,10 +286,6 @@ int has_object(struct repository *r, const struct object_id *oid, * These functions can be removed once all callers have migrated to * has_object() and/or oid_object_info_extended(). */ -#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS -#define has_sha1_file_with_flags(sha1, flags) repo_has_sha1_file_with_flags(the_repository, sha1, flags) -#define has_sha1_file(sha1) repo_has_sha1_file(the_repository, sha1) -#endif int repo_has_object_file(struct repository *r, const struct object_id *oid); int repo_has_object_file_with_flags(struct repository *r, const struct object_id *oid, int flags); From patchwork Fri Nov 19 20:26:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12629525 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 50BB4C433EF for ; Fri, 19 Nov 2021 20:26:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2EBDE613C8 for ; Fri, 19 Nov 2021 20:26:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235354AbhKSU3j (ORCPT ); Fri, 19 Nov 2021 15:29:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234916AbhKSU3f (ORCPT ); Fri, 19 Nov 2021 15:29:35 -0500 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0506C061748 for ; Fri, 19 Nov 2021 12:26:32 -0800 (PST) Received: by mail-wm1-x32c.google.com with SMTP id f7-20020a1c1f07000000b0032ee11917ceso8435202wmf.0 for ; Fri, 19 Nov 2021 12:26:32 -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=QE6994fTb5NMjei5kwjNFNhLxOamiXDYIwmi5GcfL2c=; b=LqYzMTDTpM+qP4GHFbhF8IFrprM/wLoEHHKYmlhDiS5BITap1Q+3LKGF8N1E+VmX7U PEttszh2xPgIHkg6CmPDUx64RxBJperF0liEXNgRHPwrIjYSZU5L7vd1/m+RVakqfl2W wCGGY5dCEKuu5h0UnF0CsuggI1gLcuEtQqQzm4RqQHk76v0j//8mGKZ6Zumy+jV4kLdD 7YW6+oK0JXopDV9ehiw3/HGlzbITzf/wpuFHbT/9IC2e6IJh2L052XWRK0nzyCKDubXB oXWbXF+v4fEQN98GbQv2R2ACPRED0Va7pW3WI0IlegCdHXuaxGIFN5FhKL0IE7khCtuK a6aA== 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=QE6994fTb5NMjei5kwjNFNhLxOamiXDYIwmi5GcfL2c=; b=KorRwRhbQ74go/x+KiFiij+PLoOdm/LNd3YiTlTDWeEXh+GYsFCJLqJNBZ5ycVBRI0 TauGTA8kfAohB0ns/4B047Kqr12YU7JN05/iKaBlH+dmLK0QTQlejuyES50yf+Pl3a3h pZSpiZbvF7p1cmrDWRb/VeByBonXEgNqFAlxpcrdIvYCaje85lPnU5LjdXfoYSFMG4JE vlt/rzfROxdaq1SSkIl3mi/kaUEMs6NMHGC8C5DAN4PGhDqK5uJAFfWCIXRAlRnsCw0I donD/nO1v8APkXqtcH3/m4JNVV2J4xz59TgSKnAjkh08sAeVUB+Q2Ha1j24kNds6Fyoi Xcug== X-Gm-Message-State: AOAM531ZUbzZMDDOxqfYO7mZcl23IUojAZnXGRoazO+ggeijL1L4U9Tn GIY98KbtZEKn+/O6DblsaA85UP0gSWV8oA== X-Google-Smtp-Source: ABdhPJz+f1oML4f8UJbta0vtH0l88QEsYqVM+6Ye1bhwvGxwrFcSJstIWHNhYzoR5EGe7F+TG9stmg== X-Received: by 2002:a1c:96:: with SMTP id 144mr3131438wma.126.1637353590958; Fri, 19 Nov 2021 12:26:30 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id bg14sm856202wmb.5.2021.11.19.12.26.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Nov 2021 12:26:30 -0800 (PST) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH v2 4/5] alloc.[ch]: remove alloc_report() function Date: Fri, 19 Nov 2021 21:26:24 +0100 Message-Id: X-Mailer: git-send-email 2.34.0.823.gcc3243ae16c In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The alloc_report() function has been orphaned since its introduction in 855419f764a (Add specialized object allocator, 2006-06-19), it appears to have been used for demonstration purposes in that commit message. Signed-off-by: Ævar Arnfjörð Bjarmason --- alloc.c | 19 ------------------- alloc.h | 1 - 2 files changed, 20 deletions(-) diff --git a/alloc.c b/alloc.c index 957a0af3626..bf7982712f1 100644 --- a/alloc.c +++ b/alloc.c @@ -122,22 +122,3 @@ void *alloc_commit_node(struct repository *r) init_commit_node(c); return c; } - -static void report(const char *name, unsigned int count, size_t size) -{ - fprintf(stderr, "%10s: %8u (%"PRIuMAX" kB)\n", - name, count, (uintmax_t) size); -} - -#define REPORT(name, type) \ - report(#name, r->parsed_objects->name##_state->count, \ - r->parsed_objects->name##_state->count * sizeof(type) >> 10) - -void alloc_report(struct repository *r) -{ - REPORT(blob, struct blob); - REPORT(tree, struct tree); - REPORT(commit, struct commit); - REPORT(tag, struct tag); - REPORT(object, union any_object); -} diff --git a/alloc.h b/alloc.h index 371d388b552..3f4a0ad310a 100644 --- a/alloc.h +++ b/alloc.h @@ -13,7 +13,6 @@ void init_commit_node(struct commit *c); void *alloc_commit_node(struct repository *r); void *alloc_tag_node(struct repository *r); void *alloc_object_node(struct repository *r); -void alloc_report(struct repository *r); struct alloc_state *allocate_alloc_state(void); void clear_alloc_state(struct alloc_state *s); From patchwork Fri Nov 19 20:26:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12629523 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 60DE9C433F5 for ; Fri, 19 Nov 2021 20:26:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3B54E61AA2 for ; Fri, 19 Nov 2021 20:26:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234918AbhKSU3i (ORCPT ); Fri, 19 Nov 2021 15:29:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235285AbhKSU3h (ORCPT ); Fri, 19 Nov 2021 15:29:37 -0500 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 5C2A3C06175A for ; Fri, 19 Nov 2021 12:26:33 -0800 (PST) Received: by mail-wr1-x436.google.com with SMTP id a9so20090061wrr.8 for ; Fri, 19 Nov 2021 12:26:33 -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=fGTPAzjBxHiBN4ZiLHqa1yUBTlCpWk/DAYWqRaosINM=; b=evFXV1CFTCuydPux0C39tb03GDzs9ArQJYa0IhzmIQPv+BjtemFYoW5t9LcId7Jh0V 7LfDFNat3Bq3yhiQsIhO+bk7XvTcTuQACW08QBNhi2HRKKZySCG8Gxq3RWX0x/O9j0AT y4TuemxGz++fY2C4G8j1tp7lUZyjwsnH87O+tDjOYmv2Y7ynXtqVX0qzNpTqj6LJ7LwC z0AE3WXrJXIfvzp71DON83/U6X53E6ktvWAUzaWGdtxpF9MBYkXltXOFVtMH9RoD3ung 4GyNKB0rPHTpgJ80yRyfwsW6rHIm499y4/Bf0pXlVFfZ/0IssjpM1R1mpGlJiexYxVTL 7Reg== 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=fGTPAzjBxHiBN4ZiLHqa1yUBTlCpWk/DAYWqRaosINM=; b=FPVniSs+1F+nvDIMDpXEc0WiYScq2m1XDJiGkInNyMm/2fsoPiSNI9OYmJJlExMYF4 Le6sErqnqlMq3oIapl+fshk3SGbbxc1ft4MvS6/G2U4M1eMAgBDPIzZWtW8M9dArF2S3 IhgSeS0OX4iKq2xEt1QjPAi3Z5GhSHPs711eJph9220nMyyAlotlRZYXC3h2sCxQhZlQ 89e6pAVU26zjAMKq3F8y+CCb3ld8d2E40OTBAgXy/XtYW6Y1XWlQD+/OIv5FDpF9z/0z htCH24GtzColG81MSRBtYg/kkVBY16V8m0D1RdCjSz1BB4ALLgUBVLqT67+OhEXtEmCR 8wvQ== X-Gm-Message-State: AOAM531K7e7DuUEs+olA1qNilRxaPTnHJPIK6KZ0lPO6bJZjGoI6DWkN bMOo8vT9KBWsdbNx8fnKIPP4O0ajG8tJ6Q== X-Google-Smtp-Source: ABdhPJxI24rm9lnTaKCIBzs6I+M9WsmWR6XzjEj0xyTm0b0B5jQl44CSximGXU9u9uLY/t3d+LfEMw== X-Received: by 2002:a5d:47a1:: with SMTP id 1mr10512718wrb.436.1637353591688; Fri, 19 Nov 2021 12:26:31 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id bg14sm856202wmb.5.2021.11.19.12.26.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Nov 2021 12:26:31 -0800 (PST) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH v2 5/5] json-writer.[ch]: remove unused formatting functions Date: Fri, 19 Nov 2021 21:26:25 +0100 Message-Id: X-Mailer: git-send-email 2.34.0.823.gcc3243ae16c In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org These were added in 75459410edd (json_writer: new routines to create JSON data, 2018-07-13) for future use with trace2, but have not been used by anything. These are easy enough to bring back should we need them, but until then there's no point in carrying them. Signed-off-by: Ævar Arnfjörð Bjarmason --- json-writer.c | 24 ------------------------ json-writer.h | 3 --- 2 files changed, 27 deletions(-) diff --git a/json-writer.c b/json-writer.c index f1cfd8fa8c6..8a81c2d5fce 100644 --- a/json-writer.c +++ b/json-writer.c @@ -331,36 +331,12 @@ void jw_array_false(struct json_writer *jw) strbuf_addstr(&jw->json, "false"); } -void jw_array_bool(struct json_writer *jw, int value) -{ - if (value) - jw_array_true(jw); - else - jw_array_false(jw); -} - void jw_array_null(struct json_writer *jw) { array_common(jw); strbuf_addstr(&jw->json, "null"); } -void jw_array_sub_jw(struct json_writer *jw, const struct json_writer *value) -{ - assert_is_terminated(value); - - array_common(jw); - append_sub_jw(jw, value); -} - -void jw_array_argc_argv(struct json_writer *jw, int argc, const char **argv) -{ - int k; - - for (k = 0; k < argc; k++) - jw_array_string(jw, argv[k]); -} - void jw_array_argv(struct json_writer *jw, const char **argv) { while (*argv) diff --git a/json-writer.h b/json-writer.h index 209355e0f12..563c7e0e004 100644 --- a/json-writer.h +++ b/json-writer.h @@ -95,10 +95,7 @@ void jw_array_intmax(struct json_writer *jw, intmax_t value); void jw_array_double(struct json_writer *jw, int precision, double value); void jw_array_true(struct json_writer *jw); void jw_array_false(struct json_writer *jw); -void jw_array_bool(struct json_writer *jw, int value); void jw_array_null(struct json_writer *jw); -void jw_array_sub_jw(struct json_writer *jw, const struct json_writer *value); -void jw_array_argc_argv(struct json_writer *jw, int argc, const char **argv); void jw_array_argv(struct json_writer *jw, const char **argv); void jw_array_inline_begin_object(struct json_writer *jw);