From patchwork Thu Dec 31 11:56:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 11994043 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13336C433E9 for ; Thu, 31 Dec 2020 11:57:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D3BBB2242A for ; Thu, 31 Dec 2020 11:57:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726539AbgLaL52 (ORCPT ); Thu, 31 Dec 2020 06:57:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726071AbgLaL51 (ORCPT ); Thu, 31 Dec 2020 06:57:27 -0500 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6AD3BC06179B for ; Thu, 31 Dec 2020 03:56:46 -0800 (PST) Received: by mail-lf1-x130.google.com with SMTP id a12so43640896lfl.6 for ; Thu, 31 Dec 2020 03:56:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+5zVxCKNU0XKxztAJfIs6Z3+5g0jvrMJaBGwrXuObjo=; b=n0QnejDtU2UqyOkhCnvdxS2rukqTu//gnvjft1Fvhbb0dk4NF+DOkG+PZ+p+V2ZJvk +RdjgSBfoSRcPHnsb+avEA9a71jUWgQqoHGV7jQ2QH8vjHGPuki/jimxAHjocnxLMlkW D58oIg2mY3p5EhP6IXqt06KBdBkXqqsr3HD7fStO2Jpiv09ojwE0dEv7EMOcWZm3gasq vG39z4aulLRrSOwgc7XTOZ7yrH3IwSiGa4p0Cf2m+fzdyDaKnoyQrS2RtzXoSnZqBR2q pO4ww9w0YzMjV1SYymlb7QdyjNP07VDXYklPXGgB1ki/Io4aaPs3ds8sgfWbPkM9Q8sv TSOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+5zVxCKNU0XKxztAJfIs6Z3+5g0jvrMJaBGwrXuObjo=; b=aF3NpDcXFH/7oYgoQuu5pRLurdbV7HSbTaQHA31Kvjo+zh6RXrqLIc97rfIE3m7flx 4xlbPfa3gjmM6t3kP+6ydNRiiNbseXGZC7t6ZlhcFzPJa143feg8ny81GDGRhzjdWLOR db9ezWyZme6lXjl/WWCgs+Lg5gtG38g3GRF+NwmXvGgE/oAZJLNVnyh3S6pT0BuUY0gG IjhjNuYh4H4ExUwOYF0HeQ9mo0SbtDjRpOD5uJb4p3H3i+2hjYh3PKYmQoCudUi9vK4j f+8JsmNJD3eOaXwDP54IOkPIOnK6WLvT/l3jQGdfYkiwCsAAR+H2HiXr/kLmW9Lj5v4n 8DPQ== X-Gm-Message-State: AOAM530K/wIFxkohOEZHROua+pd7XTxtAwhyp8AUlrgyM3v97qVb70JL cYMsg8xQMMk/dHZT0w9Y/Yf/n2ewmNU= X-Google-Smtp-Source: ABdhPJxQbAZNRHYv/K3aY2XUJS4tP4RIGVD7wwuQu/Eo1VhE6oarV3e2STQ2Fdr65fchD0NyQIpoNg== X-Received: by 2002:a19:4841:: with SMTP id v62mr21592386lfa.607.1609415804600; Thu, 31 Dec 2020 03:56:44 -0800 (PST) Received: from localhost.localdomain (host-189-203-5.junet.se. [207.189.203.5]) by smtp.gmail.com with ESMTPSA id m11sm7505329ljp.12.2020.12.31.03.56.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 03:56:44 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: "brian m . carlson" , Derrick Stolee Subject: [PATCH v2 3/4] sha1-lookup: rename `sha1_pos()` as `hash_pos()` Date: Thu, 31 Dec 2020 12:56:22 +0100 Message-Id: <91617de0acfca8d944d5ed75c84b5cd3597f776f.1609415114.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Rename this function to reflect that we're not just able to handle SHA-1 these days. There are a few instances of "sha1" left in sha1-lookup.[ch] after this, but those will be addressed in the next commit. Signed-off-by: Martin Ågren --- sha1-lookup.h | 6 +++--- builtin/name-rev.c | 2 +- commit-graph.c | 6 +++--- commit.c | 2 +- oid-array.c | 2 +- pack-bitmap-write.c | 2 +- rerere.c | 2 +- sha1-lookup.c | 8 ++++---- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sha1-lookup.h b/sha1-lookup.h index 5afcd011c6..79973d4785 100644 --- a/sha1-lookup.h +++ b/sha1-lookup.h @@ -1,12 +1,12 @@ #ifndef SHA1_LOOKUP_H #define SHA1_LOOKUP_H -typedef const unsigned char *sha1_access_fn(size_t index, void *table); +typedef const unsigned char *hash_access_fn(size_t index, void *table); -int sha1_pos(const unsigned char *sha1, +int hash_pos(const unsigned char *hash, void *table, size_t nr, - sha1_access_fn fn); + hash_access_fn fn); /* * Searches for sha1 in table, using the given fanout table to determine the diff --git a/builtin/name-rev.c b/builtin/name-rev.c index 725dd04519..4939ceb2e5 100644 --- a/builtin/name-rev.c +++ b/builtin/name-rev.c @@ -408,7 +408,7 @@ static const char *get_exact_ref_match(const struct object *o) tip_table.sorted = 1; } - found = sha1_pos(o->oid.hash, tip_table.table, tip_table.nr, + found = hash_pos(o->oid.hash, tip_table.table, tip_table.nr, nth_tip_table_ent); if (0 <= found) return tip_table.table[found].refname; diff --git a/commit-graph.c b/commit-graph.c index 06f8dc1d89..c672feee91 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -1043,7 +1043,7 @@ static int write_graph_chunk_data(struct hashfile *f, if (!parent) edge_value = GRAPH_PARENT_NONE; else { - edge_value = sha1_pos(parent->item->object.oid.hash, + edge_value = hash_pos(parent->item->object.oid.hash, ctx->commits.list, ctx->commits.nr, commit_to_sha1); @@ -1074,7 +1074,7 @@ static int write_graph_chunk_data(struct hashfile *f, else if (parent->next) edge_value = GRAPH_EXTRA_EDGES_NEEDED | num_extra_edges; else { - edge_value = sha1_pos(parent->item->object.oid.hash, + edge_value = hash_pos(parent->item->object.oid.hash, ctx->commits.list, ctx->commits.nr, commit_to_sha1); @@ -1143,7 +1143,7 @@ static int write_graph_chunk_extra_edges(struct hashfile *f, /* Since num_parents > 2, this initializer is safe. */ for (parent = (*list)->parents->next; parent; parent = parent->next) { - int edge_value = sha1_pos(parent->item->object.oid.hash, + int edge_value = hash_pos(parent->item->object.oid.hash, ctx->commits.list, ctx->commits.nr, commit_to_sha1); diff --git a/commit.c b/commit.c index fe1fa3dc41..0b7bace022 100644 --- a/commit.c +++ b/commit.c @@ -113,7 +113,7 @@ static const unsigned char *commit_graft_sha1_access(size_t index, void *table) int commit_graft_pos(struct repository *r, const unsigned char *sha1) { - return sha1_pos(sha1, r->parsed_objects->grafts, + return hash_pos(sha1, r->parsed_objects->grafts, r->parsed_objects->grafts_nr, commit_graft_sha1_access); } diff --git a/oid-array.c b/oid-array.c index 8e1bcedc0c..fb4c3dd795 100644 --- a/oid-array.c +++ b/oid-array.c @@ -31,7 +31,7 @@ static const unsigned char *sha1_access(size_t index, void *table) int oid_array_lookup(struct oid_array *array, const struct object_id *oid) { oid_array_sort(array); - return sha1_pos(oid->hash, array->oid, array->nr, sha1_access); + return hash_pos(oid->hash, array->oid, array->nr, sha1_access); } void oid_array_clear(struct oid_array *array) diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c index 5e998bdaa7..27ece05ec7 100644 --- a/pack-bitmap-write.c +++ b/pack-bitmap-write.c @@ -482,7 +482,7 @@ static void write_selected_commits_v1(struct hashfile *f, struct bitmapped_commit *stored = &writer.selected[i]; int commit_pos = - sha1_pos(stored->commit->object.oid.hash, index, index_nr, sha1_access); + hash_pos(stored->commit->object.oid.hash, index, index_nr, sha1_access); if (commit_pos < 0) BUG("trying to write commit not in index"); diff --git a/rerere.c b/rerere.c index 9281131a9f..9fc76eb756 100644 --- a/rerere.c +++ b/rerere.c @@ -147,7 +147,7 @@ static struct rerere_dir *find_rerere_dir(const char *hex) if (get_sha1_hex(hex, hash)) return NULL; /* BUG */ - pos = sha1_pos(hash, rerere_dir, rerere_dir_nr, rerere_dir_hash); + pos = hash_pos(hash, rerere_dir, rerere_dir_nr, rerere_dir_hash); if (pos < 0) { rr_dir = xmalloc(sizeof(*rr_dir)); hashcpy(rr_dir->hash, hash); diff --git a/sha1-lookup.c b/sha1-lookup.c index 29185844ec..45489edfe8 100644 --- a/sha1-lookup.c +++ b/sha1-lookup.c @@ -47,11 +47,11 @@ static uint32_t take2(const unsigned char *sha1) */ /* * The table should contain "nr" elements. - * The sha1 of element i (between 0 and nr - 1) should be returned + * The hash of element i (between 0 and nr - 1) should be returned * by "fn(i, table)". */ -int sha1_pos(const unsigned char *hash, void *table, size_t nr, - sha1_access_fn fn) +int hash_pos(const unsigned char *hash, void *table, size_t nr, + hash_access_fn fn) { size_t hi = nr; size_t lo = 0; @@ -74,7 +74,7 @@ int sha1_pos(const unsigned char *hash, void *table, size_t nr, if (lov != hiv) { /* * At this point miv could be equal - * to hiv (but sha1 could still be higher); + * to hiv (but hash could still be higher); * the invariant of (mi < hi) should be * kept. */