Update the write_graph_chunk_*() helper functions to have the same signature: - Return an int error code from all these functions. write_graph_chunk_base() already has an int error code, now the others will have one, too, but since they don't indicate any error, they will always return 0. - Drop the hash size parameter of write_graph_chunk_oids() and write_graph_chunk_data(); its value can be read directly from 'the_hash_algo' inside these functions as well. This opens up the possibility for further cleanups and foolproofing in the following two patches. Signed-off-by: SZEDER Gábor <szeder.dev@xxxxxxxxx> --- commit-graph.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/commit-graph.c b/commit-graph.c index c8ba17e457..33e70bdfea 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -793,7 +793,7 @@ struct write_commit_graph_context { const struct split_commit_graph_opts *split_opts; }; -static void write_graph_chunk_fanout(struct hashfile *f, +static int write_graph_chunk_fanout(struct hashfile *f, struct write_commit_graph_context *ctx) { int i, count = 0; @@ -815,17 +815,19 @@ static void write_graph_chunk_fanout(struct hashfile *f, hashwrite_be32(f, count); } + return 0; } -static void write_graph_chunk_oids(struct hashfile *f, int hash_len, +static int write_graph_chunk_oids(struct hashfile *f, struct write_commit_graph_context *ctx) { struct commit **list = ctx->commits.list; int count; for (count = 0; count < ctx->commits.nr; count++, list++) { display_progress(ctx->progress, ++ctx->progress_cnt); - hashwrite(f, (*list)->object.oid.hash, (int)hash_len); + hashwrite(f, (*list)->object.oid.hash, the_hash_algo->rawsz); } + return 0; } static const unsigned char *commit_to_sha1(size_t index, void *table) @@ -834,7 +836,7 @@ static const unsigned char *commit_to_sha1(size_t index, void *table) return commits[index]->object.oid.hash; } -static void write_graph_chunk_data(struct hashfile *f, int hash_len, +static int write_graph_chunk_data(struct hashfile *f, struct write_commit_graph_context *ctx) { struct commit **list = ctx->commits.list; @@ -852,7 +854,7 @@ static void write_graph_chunk_data(struct hashfile *f, int hash_len, die(_("unable to parse commit %s"), oid_to_hex(&(*list)->object.oid)); tree = get_commit_tree_oid(*list); - hashwrite(f, tree->hash, hash_len); + hashwrite(f, tree->hash, the_hash_algo->rawsz); parent = (*list)->parents; @@ -932,9 +934,10 @@ static void write_graph_chunk_data(struct hashfile *f, int hash_len, list++; } + return 0; } -static void write_graph_chunk_extra_edges(struct hashfile *f, +static int write_graph_chunk_extra_edges(struct hashfile *f, struct write_commit_graph_context *ctx) { struct commit **list = ctx->commits.list; @@ -984,6 +987,7 @@ static void write_graph_chunk_extra_edges(struct hashfile *f, list++; } + return 0; } static int oid_compare(const void *_a, const void *_b) @@ -1462,8 +1466,8 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx) chunks_nr * ctx->commits.nr); } write_graph_chunk_fanout(f, ctx); - write_graph_chunk_oids(f, hashsz, ctx); - write_graph_chunk_data(f, hashsz, ctx); + write_graph_chunk_oids(f, ctx); + write_graph_chunk_data(f, ctx); if (ctx->num_extra_edges) write_graph_chunk_extra_edges(f, ctx); if (ctx->num_commit_graphs_after > 1 && -- 2.27.0.rc1.431.g5c813f95dc