[PATCH] pack-write.c: remove unused `mtimes_name` parameter
- From
Taylor Blau <me@ttaylorr.com>
- Date
- Jun 15, 2022, 00:37 UTC
- Message-ID
- <f5bf68702d55b601ebd13bc4a6f1a34dc35abae5.1655253465.git.me@ttaylorr.com>
`write_mtimes_file()` takes an optional parameter `mtimes_name`, which specifies where to write the mtimes file. If it is NULL, a location is generated with `odb_mkstemp()`.
This imitates the pattern in `write_idx_file()`, and `write_rev_file()`, both of which have callers from the `index-pack` builtin which specify an exact location instead of generating one.
But `write_mtimes_file()` has no such caller, and always ends up calling odb_mkstemp(). To avoid confusion, remove the `mtimes_name` parameter which the lone caller of `write_mtimes_file()` always fills in with NULL.
Noticed-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Taylor Blau <me@ttaylorr.com> --- pack-write.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/pack-write.c b/pack-write.c index 23c0342018..6a78e0fad7 100644 --- a/pack-write.c +++ b/pack-write.c @@ -310,26 +310,21 @@ static void write_mtimes_trailer(struct hashfile *f, const unsigned char *hash) hashwrite(f, hash, the_hash_algo->rawsz); } -static const char *write_mtimes_file(const char *mtimes_name, - struct packing_data *to_pack, +static const char *write_mtimes_file(struct packing_data *to_pack, struct pack_idx_entry **objects, uint32_t nr_objects, const unsigned char *hash) { + struct strbuf tmp_file = STRBUF_INIT; struct hashfile *f; + const char *mtimes_name; int fd; if (!to_pack) BUG("cannot call write_mtimes_file with NULL packing_data"); - if (!mtimes_name) { - struct strbuf tmp_file = STRBUF_INIT; - fd = odb_mkstemp(&tmp_file, "pack/tmp_mtimes_XXXXXX"); - mtimes_name = strbuf_detach(&tmp_file, NULL); - } else { - unlink(mtimes_name); - fd = xopen(mtimes_name, O_CREAT|O_EXCL|O_WRONLY, 0600); - } + fd = odb_mkstemp(&tmp_file, "pack/tmp_mtimes_XXXXXX"); + mtimes_name = strbuf_detach(&tmp_file, NULL); f = hashfd(fd, mtimes_name); write_mtimes_header(f); @@ -561,7 +556,7 @@ void stage_tmp_packfiles(struct strbuf *name_buffer, pack_idx_opts->flags); if (pack_idx_opts->flags & WRITE_MTIMES) { - mtimes_tmp_name = write_mtimes_file(NULL, to_pack, written_list, + mtimes_tmp_name = write_mtimes_file(to_pack, written_list, nr_written, hash); }
-- 2.35.1