diff options
| author | Jeff King <peff@peff.net> | 2024-10-25 03:00:55 -0400 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2024-10-25 17:35:46 -0400 |
| commit | c2dc4c9fbb1f119be6ab55ff8676bf18b4b9446a (patch) | |
| tree | b32a953088493f598aea4023c1cb682b11e1b1d8 | |
| parent | 03b8eed7f50a56cd7581e18775c6f3a7caf639b4 (diff) | |
| download | git-c2dc4c9fbb1f119be6ab55ff8676bf18b4b9446a.tar.gz | |
packfile: drop sha1_pack_name()
The sha1_pack_name() function has a few ugly bits:
- it writes into a static strbuf (and not even a ring buffer of them),
which can lead to subtle invalidation problems
- it uses the term "sha1", but it's really using the_hash_algo, which
could be sha256
There's only one caller of it left. And in fact that caller is better
off using the underlying odb_pack_name() function itself, since it's
just copying the result into its own strbuf anyway.
Converting that caller lets us get rid of this now-obselete function.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
| -rw-r--r-- | http.c | 3 | ||||
| -rw-r--r-- | packfile.c | 6 | ||||
| -rw-r--r-- | packfile.h | 7 |
3 files changed, 2 insertions, 14 deletions
@@ -2579,7 +2579,8 @@ struct http_pack_request *new_direct_http_pack_request( preq->url = url; - strbuf_addf(&preq->tmpfile, "%s.temp", sha1_pack_name(packed_git_hash)); + odb_pack_name(&preq->tmpfile, packed_git_hash, "pack"); + strbuf_addstr(&preq->tmpfile, ".temp"); preq->packfile = fopen(preq->tmpfile.buf, "a"); if (!preq->packfile) { error("Unable to open local file %s for pack", diff --git a/packfile.c b/packfile.c index 0ead2290d4..48d650161f 100644 --- a/packfile.c +++ b/packfile.c @@ -35,12 +35,6 @@ char *odb_pack_name(struct strbuf *buf, return buf->buf; } -char *sha1_pack_name(const unsigned char *sha1) -{ - static struct strbuf buf = STRBUF_INIT; - return odb_pack_name(&buf, sha1, "pack"); -} - char *sha1_pack_index_name(const unsigned char *sha1) { static struct strbuf buf = STRBUF_INIT; diff --git a/packfile.h b/packfile.h index b4df3546a3..2bbcc58571 100644 --- a/packfile.h +++ b/packfile.h @@ -32,13 +32,6 @@ struct pack_entry { char *odb_pack_name(struct strbuf *buf, const unsigned char *sha1, const char *ext); /* - * Return the name of the (local) packfile with the specified sha1 in - * its name. The return value is a pointer to memory that is - * overwritten each time this function is called. - */ -char *sha1_pack_name(const unsigned char *sha1); - -/* * Return the name of the (local) pack index file with the specified * sha1 in its name. The return value is a pointer to memory that is * overwritten each time this function is called. |