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: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 308651F453 for ; Tue, 19 Feb 2019 00:06:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732183AbfBSAFu (ORCPT ); Mon, 18 Feb 2019 19:05:50 -0500 Received: from injection.crustytoothpaste.net ([192.241.140.119]:34612 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730731AbfBSAFn (ORCPT ); Mon, 18 Feb 2019 19:05:43 -0500 Received: from genre.crustytoothpaste.net (unknown [IPv6:2001:470:b978:101:3dc7:72ec:75fa:fee5]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by injection.crustytoothpaste.net (Postfix) with ESMTPSA id 8ABEA60995; Tue, 19 Feb 2019 00:05:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1550534742; bh=ns5OIlmI+Q9VJxVLCbPsvywGa+K6IjsuT4RgI4txHJI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Reply-To: Subject:Date:To:CC:Resent-Date:Resent-From:Resent-To:Resent-Cc: In-Reply-To:References:Content-Type:Content-Disposition; b=GCHXYkWOnh2tkUT0ibzrvl6b5QfPdRYqEed6YsDAUNUNnpD1zNWkBMdJ2fOpk0KvK 2HQkcHPlqn33jWCmdn9kELU+5Twgzs218H70HvgXWW/JYN4UI+rQUChWjPclfCmKfb V4UC3p6QBwAPBsO3gwRLMtxgFWojy39EbSevWS2z4rjYb+58C1NfIdzIkiKH1pqQcB UoKpO4ENWcWcmF8yJo0wrznIx5XXC3WdpwnzCpoijWGZomNhTAXdTvK2CLq54E/Wxf 0Savscid5IR/FTgLV6lUIq+2mu1ltyCt++Oy7AJAo/3a6QaGBajDRN54v9zbN4NRwi msDb/zkkLh819K/fvL2rAYC6uCRpqg0W4lOFuLcuxKptfIgVZltoc2L9btwmcq/Pyv Vyh43HBcQ2FGm9Yk8GY5R+HPaliNdj7CQLcblbJcMH5trRh1MBY5F8PsuXkiiNMcIh BMh/q32ARJw7GuM9/J5Mx2qIx49i710Y+QGLYj90224RPxIb2iG From: "brian m. carlson" To: Cc: Eric Sunshine , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= , =?UTF-8?q?Ren=C3=A9=20Scharfe?= , Jeff King Subject: [PATCH v2 04/35] pack-bitmap: convert struct stored_bitmap to object_id Date: Tue, 19 Feb 2019 00:04:55 +0000 Message-Id: <20190219000526.476553-5-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.21.0.rc0.258.g878e2cd30e In-Reply-To: <20190219000526.476553-1-sandals@crustytoothpaste.net> References: <20190219000526.476553-1-sandals@crustytoothpaste.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 127.0.1.1 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Convert struct stored_bitmap to use struct object_id. Signed-off-by: brian m. carlson --- pack-bitmap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pack-bitmap.c b/pack-bitmap.c index b53f37243c..c760913cea 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@ -18,7 +18,7 @@ * commit. */ struct stored_bitmap { - unsigned char sha1[20]; + struct object_id oid; struct ewah_bitmap *root; struct stored_bitmap *xor; int flags; @@ -181,9 +181,9 @@ static struct stored_bitmap *store_bitmap(struct bitmap_index *index, stored->root = root; stored->xor = xor_with; stored->flags = flags; - hashcpy(stored->sha1, sha1); + oidread(&stored->oid, sha1); - hash_pos = kh_put_sha1(index->bitmaps, stored->sha1, &ret); + hash_pos = kh_put_sha1(index->bitmaps, stored->oid.hash, &ret); /* a 0 return code means the insertion succeeded with no changes, * because the SHA1 already existed on the map. this is bad, there @@ -1080,7 +1080,7 @@ int rebuild_existing_bitmaps(struct bitmap_index *bitmap_git, lookup_stored_bitmap(stored), rebuild)) { hash_pos = kh_put_sha1(reused_bitmaps, - stored->sha1, + stored->oid.hash, &hash_ret); kh_value(reused_bitmaps, hash_pos) = bitmap_to_ewah(rebuild);