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: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-2.6 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_PASS,URIBL_SBL,URIBL_SBL_A shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 7EEFD1F8C7 for ; Tue, 27 Jul 2021 21:22:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233965AbhG0VVo (ORCPT ); Tue, 27 Jul 2021 17:21:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234603AbhG0VVX (ORCPT ); Tue, 27 Jul 2021 17:21:23 -0400 Received: from mail-io1-xd2d.google.com (mail-io1-xd2d.google.com [IPv6:2607:f8b0:4864:20::d2d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62DF5C061A1B for ; Tue, 27 Jul 2021 14:19:53 -0700 (PDT) Received: by mail-io1-xd2d.google.com with SMTP id n19so495634ioz.0 for ; Tue, 27 Jul 2021 14:19:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ttaylorr-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=C4rTXIodw+uQYEyZy48W2xnYJw6KexJh005knbHDbY8=; b=ve/PGuCxAZ9AddRzP88loc5WwULCVm302ypBf3pWynYzdusDm8jDaMlJXTjE3aIa3G lRVdbP24sfNaJAzIehpsJjlF7zviJ+6x7jH0yCl/lcMK9VuYWurMIfwPGy5YmgC6jkjY qvM0YkqYR8eGrY3Gs2Y4ANjjdsWshIPtyh4wjzao1xlCB3MJm06A0X/lr+65/2b4P1iI vsedd8zUDP4N3tKybGd7Fld6muC7+fnWqCtESlo4q0oP6TIlDTXiXjQzP2p4ESkhuV0X 3POZtvUxR/n0UbX1LW1jzyVW+yT68PzhUDy/x7PESf2+WFUdc7EibzrC5Q2uedy+vzil P1Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=C4rTXIodw+uQYEyZy48W2xnYJw6KexJh005knbHDbY8=; b=JoMQpEBeZ/eTfLDYNox6hW4SpKUfjHR2zCAQMlS1Ho9TwpH8v9u3227DdFwx++ScpH aBRkqUpQN5J+GqHMZrZWhHqHzP5/m2z5H5VabMrLdkKQbGrCwfm3ecVW8bAaliXwDEZC YDSKv4UKrk0iz8b2YWWRfIcdE3sjzAD17DsjaK8IcLwjQHp+58QTeo5qEjDobOWs0J0a PrfIdHruRGr2pHTL7hc38Aacy+GeCK4fj3Dzbmd3xl13suAQy0pscEYNJ1jNui4O4nVl CaDT9FauXeSmHrLKbHLEEWmFEHvHxfokZKAYyXllcv31IHm5PMUIm9cd8/eqAxjUoaEw g4mQ== X-Gm-Message-State: AOAM532FIqeTdHBzrnH8O/wvvUhuvPcObGAHMYafSgXHhNI92QaDxdyu eg2ao3ld/QHjmN5ozlYLAJDMg79eJzf6aD3y X-Google-Smtp-Source: ABdhPJwNXgV5pIXN2kGkNtWa/Yrzj7+HzzsHewJTsc7hzkJWvJe8eIYv/8rFVjjsX+sq6+Sbte1iJA== X-Received: by 2002:a5d:925a:: with SMTP id e26mr20695939iol.195.1627420792748; Tue, 27 Jul 2021 14:19:52 -0700 (PDT) Received: from localhost ([2600:1700:d843:8f:6813:d625:75e6:4f64]) by smtp.gmail.com with ESMTPSA id i2sm2550444ilq.83.2021.07.27.14.19.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jul 2021 14:19:52 -0700 (PDT) Date: Tue, 27 Jul 2021 17:19:51 -0400 From: Taylor Blau To: git@vger.kernel.org Cc: peff@peff.net, dstolee@microsoft.com, gitster@pobox.com, jonathantanmy@google.com Subject: [PATCH v3 11/25] pack-bitmap.c: introduce 'nth_bitmap_object_oid()' Message-ID: <67e6897a34cb5283daac84053c468701216f90c5.1627420428.git.me@ttaylorr.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org A subsequent patch to support reading MIDX bitmaps will be less noisy after extracting a generic function to fetch the nth OID contained in the bitmap. Signed-off-by: Taylor Blau --- pack-bitmap.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pack-bitmap.c b/pack-bitmap.c index 54dc4f7915..9d0dd1cde7 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@ -223,6 +223,13 @@ static inline uint8_t read_u8(const unsigned char *buffer, size_t *pos) #define MAX_XOR_OFFSET 160 +static int nth_bitmap_object_oid(struct bitmap_index *index, + struct object_id *oid, + uint32_t n) +{ + return nth_packed_object_id(oid, index->pack, n); +} + static int load_bitmap_entries_v1(struct bitmap_index *index) { uint32_t i; @@ -242,7 +249,7 @@ static int load_bitmap_entries_v1(struct bitmap_index *index) xor_offset = read_u8(index->map, &index->map_pos); flags = read_u8(index->map, &index->map_pos); - if (nth_packed_object_id(&oid, index->pack, commit_idx_pos) < 0) + if (nth_bitmap_object_oid(index, &oid, commit_idx_pos) < 0) return error("corrupt ewah bitmap: commit index %u out of range", (unsigned)commit_idx_pos); @@ -862,8 +869,8 @@ static unsigned long get_size_by_pos(struct bitmap_index *bitmap_git, off_t ofs = pack_pos_to_offset(pack, pos); if (packed_object_info(the_repository, pack, ofs, &oi) < 0) { struct object_id oid; - nth_packed_object_id(&oid, pack, - pack_pos_to_index(pack, pos)); + nth_bitmap_object_oid(bitmap_git, &oid, + pack_pos_to_index(pack, pos)); die(_("unable to get size of %s"), oid_to_hex(&oid)); } } else { -- 2.31.1.163.ga65ce7f831