summaryrefslogtreecommitdiff
path: root/pack-write.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2014-08-30 09:47:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-09-02 17:37:24 (GMT)
commitd773144417b1a87b4529144ab0530ecfea103754 (patch)
tree5012713e0fadd1c24db5ecdef3fd30b6b26cacf8 /pack-write.c
parentbe0b3f822b6375028b25f62894056e63cb7c3ce4 (diff)
downloadgit-d773144417b1a87b4529144ab0530ecfea103754.zip
git-d773144417b1a87b4529144ab0530ecfea103754.tar.gz
git-d773144417b1a87b4529144ab0530ecfea103754.tar.bz2
pack-write: simplify index_pack_lockfile using skip_prefix() and xstrfmt()
Get rid of magic string length constants by using skip_prefix() instead of memcmp() and use xstrfmt() for building a string instead of a PATH_MAX-sized buffer, snprintf() and xstrdup(). Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pack-write.c')
-rw-r--r--pack-write.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/pack-write.c b/pack-write.c
index 9ccf804..33293ce 100644
--- a/pack-write.c
+++ b/pack-write.c
@@ -288,13 +288,12 @@ char *index_pack_lockfile(int ip_out)
* case, we need it to remove the corresponding .keep file
* later on. If we don't get that then tough luck with it.
*/
- if (read_in_full(ip_out, packname, 46) == 46 && packname[45] == '\n' &&
- memcmp(packname, "keep\t", 5) == 0) {
- char path[PATH_MAX];
+ if (read_in_full(ip_out, packname, 46) == 46 && packname[45] == '\n') {
+ const char *name;
packname[45] = 0;
- snprintf(path, sizeof(path), "%s/pack/pack-%s.keep",
- get_object_directory(), packname + 5);
- return xstrdup(path);
+ if (skip_prefix(packname, "keep\t", &name))
+ return xstrfmt("%s/pack/pack-%s.keep",
+ get_object_directory(), name);
}
return NULL;
}