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

Merge branch 'jk/pack-name-cleanups' into maint

Browse Source 
Code clean-up.

* jk/pack-name-cleanups:
  index-pack: make pointer-alias fallbacks safer
  replace snprintf with odb_pack_name()
  odb_pack_keep(): stop generating keepfile name
  sha1_file.c: make pack-name helper globally accessible
  move odb_* declarations out of git-compat-util.h
This commit is contained in:
Junio C Hamano
2017-03-28 13:52:25 -07:00
parent 8f71209d1e f20754802a
commit ba5e05ffef
6 changed files with 57 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sha1_file.c
View File

@ -203,31 +203,26 @@ static const char *alt_sha1_path(struct alternate_object_database *alt,
return buf->buf;
}
/*
* Return the name of the pack or index file with the specified sha1
* in its filename. *base and *name are scratch space that must be
* provided by the caller. which should be "pack" or "idx".
*/
static char *sha1_get_pack_name(const unsigned char *sha1,
struct strbuf *buf,
const char *which)
char *odb_pack_name(struct strbuf *buf,
const unsigned char *sha1,
const char *ext)
{
strbuf_reset(buf);
strbuf_addf(buf, "%s/pack/pack-%s.%s", get_object_directory(),
sha1_to_hex(sha1), which);
sha1_to_hex(sha1), ext);
return buf->buf;
}
char *sha1_pack_name(const unsigned char *sha1)
{
static struct strbuf buf = STRBUF_INIT;
return sha1_get_pack_name(sha1, &buf, "pack");
return odb_pack_name(&buf, sha1, "pack");
}
char *sha1_pack_index_name(const unsigned char *sha1)
{
static struct strbuf buf = STRBUF_INIT;
return sha1_get_pack_name(sha1, &buf, "idx");
return odb_pack_name(&buf, sha1, "idx");
}
struct alternate_object_database *alt_odb_list;