freshlybakedca.ke / git
Git fork
fork atom

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>

authored by

Jeff King and committed by
Taylor Blau c2dc4c9f 03b8eed7

+2 -14
+2 -1
http.c
··· 2579 2579 2580 2580 preq->url = url; 2581 2581 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"); 2583 2584 preq->packfile = fopen(preq->tmpfile.buf, "a"); 2584 2585 if (!preq->packfile) { 2585 2586 error("Unable to open local file %s for pack",
-6
packfile.c
··· 35 35 return buf->buf; 36 36 } 37 37 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 - 44 38 char *sha1_pack_index_name(const unsigned char *sha1) 45 39 { 46 40 static struct strbuf buf = STRBUF_INIT;
-7
packfile.h
··· 32 32 char *odb_pack_name(struct strbuf *buf, const unsigned char *sha1, const char *ext); 33 33 34 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 - 41 - /* 42 35 * Return the name of the (local) pack index file with the specified 43 36 * sha1 in its name. The return value is a pointer to memory that is 44 37 * overwritten each time this function is called.