summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2017-03-16 10:27:00 -0400
committerJunio C Hamano <gitster@pobox.com>2017-03-16 11:04:34 -0700
commit82c9d6614bcd80bc2b6646f3943971fa0ec20135 (patch)
tree084ea5e00931917f4ff77d1965b09cd563f06665
parente7e07d5a4fcc2a203d9873968ad3e6bd4d7419d7 (diff)
downloadgit-82c9d6614bcd80bc2b6646f3943971fa0ec20135.tar.gz
move odb_* declarations out of git-compat-util.h
These functions were originally conceived as wrapper functions similar to xmkstemp(). They were later moved by 463db9b10 (wrapper: move odb_* to environment.c, 2010-11-06). The more appropriate place for a declaration is in cache.h. While we're at it, let's add some basic docstrings. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--cache.h12
-rw-r--r--git-compat-util.h2
2 files changed, 12 insertions, 2 deletions
diff --git a/cache.h b/cache.h
index 61fc86e6d7..8b7b008704 100644
--- a/cache.h
+++ b/cache.h
@@ -1564,6 +1564,18 @@ extern struct packed_git *find_sha1_pack(const unsigned char *sha1,
extern void pack_report(void);
/*
+ * Create a temporary file rooted in the object database directory.
+ */
+extern int odb_mkstemp(char *template, size_t limit, const char *pattern);
+
+/*
+ * 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".
+ */
+extern int odb_pack_keep(char *name, size_t namesz, const unsigned char *sha1);
+
+/*
* mmap the index file for the specified packfile (if it is not
* already mmapped). Return 0 on success.
*/
diff --git a/git-compat-util.h b/git-compat-util.h
index ef6d560e15..412703b4ff 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -803,8 +803,6 @@ extern FILE *xfopen(const char *path, const char *mode);
extern FILE *xfdopen(int fd, const char *mode);
extern int xmkstemp(char *template);
extern int xmkstemp_mode(char *template, int mode);
-extern int odb_mkstemp(char *template, size_t limit, const char *pattern);
-extern int odb_pack_keep(char *name, size_t namesz, const unsigned char *sha1);
extern char *xgetcwd(void);
extern FILE *fopen_for_writing(const char *path);