mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

packfile: drop sha1_pack_name()

Browse Source 
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>
This commit is contained in:
Jeff King
2024-10-25 03:00:55 -04:00
committed by Taylor Blau
parent 03b8eed7f5
commit c2dc4c9fbb
3 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
http.c
View File

@ -2579,7 +2579,8 @@ struct http_pack_request *new_direct_http_pack_request(
preq->url = url; 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"); preq->packfile = fopen(preq->tmpfile.buf, "a");
if (!preq->packfile) { if (!preq->packfile) {
error("Unable to open local file %s for pack", error("Unable to open local file %s for pack",

6
packfile.c
View File

@ -35,12 +35,6 @@ char *odb_pack_name(struct strbuf *buf,
return buf->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) char *sha1_pack_index_name(const unsigned char *sha1)
{ {
static struct strbuf buf = STRBUF_INIT; static struct strbuf buf = STRBUF_INIT;

7
packfile.h
View File

@ -31,13 +31,6 @@ struct pack_entry {
*/ */
char *odb_pack_name(struct strbuf *buf, const unsigned char *sha1, const char *ext); 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 * 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 * sha1 in its name. The return value is a pointer to memory that is