@matheusbsbs / matheus-bagliano / commits / 92e2cab96b

Always use oidread to read into struct object_id

In the future, we'll want oidread to automatically set the hash algorithm member for an object ID we read into it, so ensure we use oidread instead of hashcpy everywhere we're copying a hash value into a struct object_id. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

brian m. carlson committed Apr 26, 2021 at 01:02 UTC 92e2cab96b8b8ea9a076dc279864226b3d0863e9

13 files changed +23 -23

archive.c

+1 -1

@@ -203,7 +203,7 @@ static void queue_directory(const unsigned char *sha1,

203 d->mode = mode;

204 c->bottom = d;

205 d->len = xsnprintf(d->path, len, "%.*s%s/", (int)base->len, base->buf, filename);

206 - hashcpy(d->oid.hash, sha1);

206 + oidread(&d->oid, sha1);

207 }

208

209 static int write_directory(struct archiver_context *c)

builtin/fast-import.c

+2 -2

@@ -1276,8 +1276,8 @@ static void load_tree(struct tree_entry *root)

1276 e->versions[0].mode = e->versions[1].mode;

1277 e->name = to_atom(c, strlen(c));

1278 c += e->name->str_len + 1;

1279 - hashcpy(e->versions[0].oid.hash, (unsigned char *)c);

1280 - hashcpy(e->versions[1].oid.hash, (unsigned char *)c);

1279 + oidread(&e->versions[0].oid, (unsigned char *)c);

1280 + oidread(&e->versions[1].oid, (unsigned char *)c);

1281 c += the_hash_algo->rawsz;

1282 }

1283 free(buf);

builtin/index-pack.c

+2 -2

@@ -524,7 +524,7 @@ static void *unpack_raw_entry(struct object_entry *obj,

524

525 switch (obj->type) {

526 case OBJ_REF_DELTA:

527 - hashcpy(ref_oid->hash, fill(the_hash_algo->rawsz));

527 + oidread(ref_oid, fill(the_hash_algo->rawsz));

528 use(the_hash_algo->rawsz);

529 break;

530 case OBJ_OFS_DELTA:

@@ -1358,7 +1358,7 @@ static struct object_entry *append_obj_to_pack(struct hashfile *f,

1358 obj[1].idx.offset += write_compressed(f, buf, size);

1359 obj[0].idx.crc32 = crc32_end(f);

1360 hashflush(f);

1361 - hashcpy(obj->idx.oid.hash, sha1);

1361 + oidread(&obj->idx.oid, sha1);

1362 return obj;

1363 }

1364

builtin/unpack-objects.c

+1 -1

@@ -355,7 +355,7 @@ static void unpack_delta_entry(enum object_type type, unsigned long delta_size,

355 struct object_id base_oid;

356

357 if (type == OBJ_REF_DELTA) {

358 - hashcpy(base_oid.hash, fill(the_hash_algo->rawsz));

358 + oidread(&base_oid, fill(the_hash_algo->rawsz));

359 use(the_hash_algo->rawsz);

360 delta_data = get_data(delta_size);

361 if (dry_run || !delta_data) {

commit-graph.c

+6 -6

@@ -425,7 +425,7 @@ struct commit_graph *parse_commit_graph(struct repository *r,

425 FREE_AND_NULL(graph->bloom_filter_settings);

426 }

427

428 - hashcpy(graph->oid.hash, graph->data + graph->data_len - graph->hash_len);

428 + oidread(&graph->oid, graph->data + graph->data_len - graph->hash_len);

429

430 if (verify_commit_graph_lite(graph))

431 goto free_and_return;

@@ -746,7 +746,7 @@ static void load_oid_from_graph(struct commit_graph *g,

746

747 lex_index = pos - g->num_commits_in_base;

748

749 - hashcpy(oid->hash, g->chunk_oid_lookup + g->hash_len * lex_index);

749 + oidread(oid, g->chunk_oid_lookup + g->hash_len * lex_index);

750 }

751

752 static struct commit_list **insert_parent_or_die(struct repository *r,

@@ -939,7 +939,7 @@ static struct tree *load_tree_for_commit(struct repository *r,

939 commit_data = g->chunk_commit_data +

940 GRAPH_DATA_WIDTH * (graph_pos - g->num_commits_in_base);

941

942 - hashcpy(oid.hash, commit_data);

942 + oidread(&oid, commit_data);

943 set_commit_tree(c, lookup_tree(r, &oid));

944

945 return c->maybe_tree;

@@ -2322,7 +2322,7 @@ int write_commit_graph(struct object_directory *odb,

2322 struct commit_graph *g = ctx->r->objects->commit_graph;

2323 for (i = 0; i < g->num_commits; i++) {

2324 struct object_id oid;

2325 - hashcpy(oid.hash, g->chunk_oid_lookup + g->hash_len * i);

2325 + oidread(&oid, g->chunk_oid_lookup + g->hash_len * i);

2326 oid_array_append(&ctx->oids, &oid);

2327 }

2328 }

@@ -2453,7 +2453,7 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags)

2453 for (i = 0; i < g->num_commits; i++) {

2454 struct commit *graph_commit;

2455

2456 - hashcpy(cur_oid.hash, g->chunk_oid_lookup + g->hash_len * i);

2456 + oidread(&cur_oid, g->chunk_oid_lookup + g->hash_len * i);

2457

2458 if (i && oidcmp(&prev_oid, &cur_oid) >= 0)

2459 graph_report(_("commit-graph has incorrect OID order: %s then %s"),

@@ -2501,7 +2501,7 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags)

2501 timestamp_t generation;

2502

2503 display_progress(progress, i + 1);

2504 - hashcpy(cur_oid.hash, g->chunk_oid_lookup + g->hash_len * i);

2504 + oidread(&cur_oid, g->chunk_oid_lookup + g->hash_len * i);

2505

2506 graph_commit = lookup_commit(r, &cur_oid);

2507 odb_commit = (struct commit *)create_object(r, &cur_oid, alloc_commit_node(r));

dir.c

+2 -2

@@ -3344,7 +3344,7 @@ static void read_oid(size_t pos, void *cb)

3344 rd->data = rd->end + 1;

3345 return;

3346 }

3347 - hashcpy(ud->exclude_oid.hash, rd->data);

3347 + oidread(&ud->exclude_oid, rd->data);

3348 rd->data += the_hash_algo->rawsz;

3349 }

3350

@@ -3352,7 +3352,7 @@ static void load_oid_stat(struct oid_stat *oid_stat, const unsigned char *data,

3352 const unsigned char *sha1)

3353 {

3354 stat_data_from_disk(&oid_stat->stat, data);

3355 - hashcpy(oid_stat->oid.hash, sha1);

3355 + oidread(&oid_stat->oid, sha1);

3356 oid_stat->valid = 1;

3357 }

3358

http-walker.c

+1 -1

@@ -155,7 +155,7 @@ static void prefetch(struct walker *walker, unsigned char *sha1)

155

156 newreq = xmalloc(sizeof(*newreq));

157 newreq->walker = walker;

158 - hashcpy(newreq->oid.hash, sha1);

158 + oidread(&newreq->oid, sha1);

159 newreq->repo = data->alt;

160 newreq->state = WAITING;

161 newreq->req = NULL;

match-trees.c

+1 -1

@@ -226,7 +226,7 @@ static int splice_tree(const struct object_id *oid1, const char *prefix,

226 oid_to_hex(oid1));

227 if (*subpath) {

228 struct object_id tree_oid;

229 - hashcpy(tree_oid.hash, rewrite_here);

229 + oidread(&tree_oid, rewrite_here);

230 status = splice_tree(&tree_oid, subpath, oid2, &subtree);

231 if (status)

232 return status;

midx.c

+1 -1

@@ -247,7 +247,7 @@ struct object_id *nth_midxed_object_oid(struct object_id *oid,

247 if (n >= m->num_objects)

248 return NULL;

249

250 - hashcpy(oid->hash, m->chunk_oid_lookup + m->hash_len * n);

250 + oidread(oid, m->chunk_oid_lookup + m->hash_len * n);

251 return oid;

252 }

253

notes.c

+2 -2

@@ -352,7 +352,7 @@ static void add_non_note(struct notes_tree *t, char *path,

352 n->next = NULL;

353 n->path = path;

354 n->mode = mode;

355 - hashcpy(n->oid.hash, sha1);

355 + oidread(&n->oid, sha1);

356 t->prev_non_note = n;

357

358 if (!t->first_non_note) {

@@ -1134,7 +1134,7 @@ int remove_note(struct notes_tree *t, const unsigned char *object_sha1)

1134 if (!t)

1135 t = &default_notes_tree;

1136 assert(t->initialized);

1137 - hashcpy(l.key_oid.hash, object_sha1);

1137 + oidread(&l.key_oid, object_sha1);

1138 oidclr(&l.val_oid);

1139 note_tree_remove(t, t->root, 0, &l);

1140 if (is_null_oid(&l.val_oid)) /* no note was removed */

read-cache.c

+2 -2

@@ -1845,7 +1845,7 @@ static struct cache_entry *create_from_disk(struct mem_pool *ce_mem_pool,

1845 ce->ce_flags = flags & ~CE_NAMEMASK;

1846 ce->ce_namelen = len;

1847 ce->index = 0;

1848 - hashcpy(ce->oid.hash, ondisk->data);

1848 + oidread(&ce->oid, ondisk->data);

1849 memcpy(ce->name, name, len);

1850 ce->name[len] = '\0';

1851

@@ -2195,7 +2195,7 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist)

2195 if (verify_hdr(hdr, mmap_size) < 0)

2196 goto unmap;

2197

2198 - hashcpy(istate->oid.hash, (const unsigned char *)hdr + mmap_size - the_hash_algo->rawsz);

2198 + oidread(&istate->oid, (const unsigned char *)hdr + mmap_size - the_hash_algo->rawsz);

2199 istate->version = ntohl(hdr->hdr_version);

2200 istate->cache_nr = ntohl(hdr->hdr_entries);

2201 istate->cache_alloc = alloc_nr(istate->cache_nr);

split-index.c

+1 -1

@@ -21,7 +21,7 @@ int read_link_extension(struct index_state *istate,

21 if (sz < the_hash_algo->rawsz)

22 return error("corrupt link extension (too short)");

23 si = init_split_index(istate);

24 - hashcpy(si->base_oid.hash, data);

24 + oidread(&si->base_oid, data);

25 data += the_hash_algo->rawsz;

26 sz -= the_hash_algo->rawsz;

27 if (!sz)

tree-walk.c

+1 -1

@@ -49,7 +49,7 @@ static int decode_tree_entry(struct tree_desc *desc, const char *buf, unsigned l

49 desc->entry.path = path;

50 desc->entry.mode = canon_mode(mode);

51 desc->entry.pathlen = len - 1;

52 - hashcpy(desc->entry.oid.hash, (const unsigned char *)path + len);

52 + oidread(&desc->entry.oid, (const unsigned char *)path + len);

54 return 0;

55 }