Skip to content

Commit c2dc4c9

Browse files
peffttaylorr
authored andcommitted
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 <[email protected]> Signed-off-by: Taylor Blau <[email protected]>
1 parent 03b8eed commit c2dc4c9

File tree

3 files changed

+2
-14
lines changed

3 files changed

+2
-14
lines changed

http.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2579,7 +2579,8 @@ struct http_pack_request *new_direct_http_pack_request(
25792579

25802580
preq->url = url;
25812581

2582-
strbuf_addf(&preq->tmpfile, "%s.temp", sha1_pack_name(packed_git_hash));
2582+
odb_pack_name(&preq->tmpfile, packed_git_hash, "pack");
2583+
strbuf_addstr(&preq->tmpfile, ".temp");
25832584
preq->packfile = fopen(preq->tmpfile.buf, "a");
25842585
if (!preq->packfile) {
25852586
error("Unable to open local file %s for pack",

packfile.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,6 @@ char *odb_pack_name(struct strbuf *buf,
3535
return buf->buf;
3636
}
3737

38-
char *sha1_pack_name(const unsigned char *sha1)
39-
{
40-
static struct strbuf buf = STRBUF_INIT;
41-
return odb_pack_name(&buf, sha1, "pack");
42-
}
43-
4438
char *sha1_pack_index_name(const unsigned char *sha1)
4539
{
4640
static struct strbuf buf = STRBUF_INIT;

packfile.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,6 @@ struct pack_entry {
3131
*/
3232
char *odb_pack_name(struct strbuf *buf, const unsigned char *sha1, const char *ext);
3333

34-
/*
35-
* Return the name of the (local) packfile with the specified sha1 in
36-
* its name. The return value is a pointer to memory that is
37-
* overwritten each time this function is called.
38-
*/
39-
char *sha1_pack_name(const unsigned char *sha1);
40-
4134
/*
4235
* Return the name of the (local) pack index file with the specified
4336
* sha1 in its name. The return value is a pointer to memory that is

0 commit comments

Comments
 (0)