summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2017-03-16 14:27:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-16 18:17:00 (GMT)
commiteaeefc3276c45ff8f8c24775b7dd93155bef7d48 (patch)
tree0efbfc9ff756f244375225d3e90383f32aa61b66 /cache.h
parent1cec8c634fb76ecee862ff88066f55b63b7d5ff7 (diff)
downloadgit-eaeefc3276c45ff8f8c24775b7dd93155bef7d48.zip
git-eaeefc3276c45ff8f8c24775b7dd93155bef7d48.tar.gz
git-eaeefc3276c45ff8f8c24775b7dd93155bef7d48.tar.bz2
odb_pack_keep(): stop generating keepfile name
The odb_pack_keep() function generates the name of a .keep file and opens it. This has two problems: 1. It requires a fixed-size buffer to create the filename and doesn't notice when the result is truncated. 2. Of the two callers, one sometimes wants to open a filename it already has, which makes things awkward (it has to do so manually, and skips the leading-directory creation). Instead, let's have odb_pack_keep() just open the file. Generating the name isn't hard, and a future patch will switch callers over to odb_pack_name() anyway. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/cache.h b/cache.h
index baba4fe..0c177b7 100644
--- a/cache.h
+++ b/cache.h
@@ -1578,11 +1578,11 @@ extern int odb_mkstemp(char *template, size_t limit, const char *pattern);
extern char *odb_pack_name(struct strbuf *buf, const unsigned char *sha1, const char *ext);
/*
- * Create a pack .keep file in the object database's pack directory, for
- * a pack with checksum "sha1". The return value is a file descriptor opened
- * for writing, or -1 on error. The name of the keep file is written to "name".
+ * Create a pack .keep file named "name" (which should generally be the output
+ * of odb_pack_name). Returns a file descriptor opened for writing, or -1 on
+ * error.
*/
-extern int odb_pack_keep(char *name, size_t namesz, const unsigned char *sha1);
+extern int odb_pack_keep(const char *name);
/*
* mmap the index file for the specified packfile (if it is not