sha1-lookup: rename `sha1_pos()` as `hash_pos()`
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 <martin.agren@gmail.com> Reviewed-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Martin Ågren committed
Dec 31, 2020 at 12:56 UTC
7a7d992d0dbd78cf1fc477cf1e1caf61833b3e41
8 files changed
+15
-15
builtin/name-rev.c
+1
-1
@@ -408,7 +408,7 @@ static const char *get_exact_ref_match(const struct object *o)
408
tip_table.sorted = 1;
409
}
410
411
- found = sha1_pos(o->oid.hash, tip_table.table, tip_table.nr,
411
+ found = hash_pos(o->oid.hash, tip_table.table, tip_table.nr,
412
nth_tip_table_ent);
413
if (0 <= found)
414
return tip_table.table[found].refname;
commit-graph.c
+3
-3
@@ -1043,7 +1043,7 @@ static int write_graph_chunk_data(struct hashfile *f,
1043
if (!parent)
1044
edge_value = GRAPH_PARENT_NONE;
1045
else {
1046
- edge_value = sha1_pos(parent->item->object.oid.hash,
1046
+ edge_value = hash_pos(parent->item->object.oid.hash,
1047
ctx->commits.list,
1048
ctx->commits.nr,
1049
commit_to_sha1);
@@ -1074,7 +1074,7 @@ static int write_graph_chunk_data(struct hashfile *f,
1074
else if (parent->next)
1075
edge_value = GRAPH_EXTRA_EDGES_NEEDED | num_extra_edges;
1076
else {
1077
- edge_value = sha1_pos(parent->item->object.oid.hash,
1077
+ edge_value = hash_pos(parent->item->object.oid.hash,
1078
ctx->commits.list,
1079
ctx->commits.nr,
1080
commit_to_sha1);
@@ -1143,7 +1143,7 @@ static int write_graph_chunk_extra_edges(struct hashfile *f,
1143
1144
/* Since num_parents > 2, this initializer is safe. */
1145
for (parent = (*list)->parents->next; parent; parent = parent->next) {
1146
- int edge_value = sha1_pos(parent->item->object.oid.hash,
1146
+ int edge_value = hash_pos(parent->item->object.oid.hash,
1147
ctx->commits.list,
1148
ctx->commits.nr,
1149
commit_to_sha1);
commit.c
+1
-1
@@ -113,7 +113,7 @@ static const unsigned char *commit_graft_sha1_access(size_t index, void *table)
113
114
int commit_graft_pos(struct repository *r, const unsigned char *sha1)
115
{
116
- return sha1_pos(sha1, r->parsed_objects->grafts,
116
+ return hash_pos(sha1, r->parsed_objects->grafts,
117
r->parsed_objects->grafts_nr,
118
commit_graft_sha1_access);
119
}
oid-array.c
+1
-1
@@ -31,7 +31,7 @@ static const unsigned char *sha1_access(size_t index, void *table)
31
int oid_array_lookup(struct oid_array *array, const struct object_id *oid)
32
{
33
oid_array_sort(array);
34
- return sha1_pos(oid->hash, array->oid, array->nr, sha1_access);
34
+ return hash_pos(oid->hash, array->oid, array->nr, sha1_access);
35
}
36
37
void oid_array_clear(struct oid_array *array)
pack-bitmap-write.c
+1
-1
@@ -482,7 +482,7 @@ static void write_selected_commits_v1(struct hashfile *f,
482
struct bitmapped_commit *stored = &writer.selected[i];
483
484
int commit_pos =
485
- sha1_pos(stored->commit->object.oid.hash, index, index_nr, sha1_access);
485
+ hash_pos(stored->commit->object.oid.hash, index, index_nr, sha1_access);
486
487
if (commit_pos < 0)
488
BUG("trying to write commit not in index");
rerere.c
+1
-1
@@ -147,7 +147,7 @@ static struct rerere_dir *find_rerere_dir(const char *hex)
147
148
if (get_sha1_hex(hex, hash))
149
return NULL; /* BUG */
150
- pos = sha1_pos(hash, rerere_dir, rerere_dir_nr, rerere_dir_hash);
150
+ pos = hash_pos(hash, rerere_dir, rerere_dir_nr, rerere_dir_hash);
151
if (pos < 0) {
152
rr_dir = xmalloc(sizeof(*rr_dir));
153
hashcpy(rr_dir->hash, hash);
sha1-lookup.c
+4
-4
@@ -47,11 +47,11 @@ static uint32_t take2(const unsigned char *sha1)
47
*/
48
/*
49
* The table should contain "nr" elements.
50
- * The sha1 of element i (between 0 and nr - 1) should be returned
50
+ * The hash of element i (between 0 and nr - 1) should be returned
51
* by "fn(i, table)".
52
*/
53
-int sha1_pos(const unsigned char *hash, void *table, size_t nr,
54
- sha1_access_fn fn)
53
+int hash_pos(const unsigned char *hash, void *table, size_t nr,
54
+ hash_access_fn fn)
55
{
56
size_t hi = nr;
57
size_t lo = 0;
@@ -74,7 +74,7 @@ int sha1_pos(const unsigned char *hash, void *table, size_t nr,
74
if (lov != hiv) {
75
/*
76
* At this point miv could be equal
77
- * to hiv (but sha1 could still be higher);
77
+ * to hiv (but hash could still be higher);
78
* the invariant of (mi < hi) should be
79
* kept.
80
*/
sha1-lookup.h
+3
-3
@@ -1,12 +1,12 @@
1
#ifndef SHA1_LOOKUP_H
2
#define SHA1_LOOKUP_H
3
4
-typedef const unsigned char *sha1_access_fn(size_t index, void *table);
4
+typedef const unsigned char *hash_access_fn(size_t index, void *table);
5
6
-int sha1_pos(const unsigned char *sha1,
6
+int hash_pos(const unsigned char *hash,
7
void *table,
8
size_t nr,
9
- sha1_access_fn fn);
9
+ hash_access_fn fn);
10
11
/*
12
* Searches for sha1 in table, using the given fanout table to determine the