summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Tan <jonathantanmy@google.com>2017-08-18 15:20:23 -0700
committerJunio C Hamano <gitster@pobox.com>2017-08-23 15:12:07 -0700
commit97de1803f8972c41703424bb1697c224deb2b558 (patch)
tree4d9ed75945a0c515a29ab3c963832c8ef77360d3
parent84f80ad5e11d29b61570269a25cf447f34c5aeba (diff)
downloadgit-97de1803f8972c41703424bb1697c224deb2b558.tar.gz
pack: move unuse_pack()
Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--cache.h1
-rw-r--r--packfile.c9
-rw-r--r--packfile.h1
-rw-r--r--sha1_file.c9
4 files changed, 10 insertions, 10 deletions
diff --git a/cache.h b/cache.h
index 2e02b02d17..52deb9fa4e 100644
--- a/cache.h
+++ b/cache.h
@@ -1639,7 +1639,6 @@ extern int odb_mkstemp(struct strbuf *template, const char *pattern);
*/
extern int odb_pack_keep(const char *name);
-extern void unuse_pack(struct pack_window **);
extern void clear_delta_base_cache(void);
extern struct packed_git *add_packed_git(const char *path, size_t path_len, int local);
diff --git a/packfile.c b/packfile.c
index 85cb65558f..93526ea7b8 100644
--- a/packfile.c
+++ b/packfile.c
@@ -596,3 +596,12 @@ unsigned char *use_pack(struct packed_git *p,
*left = win->len - xsize_t(offset);
return win->base + offset;
}
+
+void unuse_pack(struct pack_window **w_cursor)
+{
+ struct pack_window *w = *w_cursor;
+ if (w) {
+ w->inuse_cnt--;
+ *w_cursor = NULL;
+ }
+}
diff --git a/packfile.h b/packfile.h
index e0596bb6b2..c669c11f88 100644
--- a/packfile.h
+++ b/packfile.h
@@ -45,6 +45,7 @@ extern void close_pack_index(struct packed_git *);
extern unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t, unsigned long *);
extern void close_pack_windows(struct packed_git *);
extern void close_all_packs(void);
+extern void unuse_pack(struct pack_window **);
extern void release_pack_memory(size_t);
diff --git a/sha1_file.c b/sha1_file.c
index abd3b59b57..9df1bd7c17 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -719,15 +719,6 @@ void *xmmap(void *start, size_t length,
return ret;
}
-void unuse_pack(struct pack_window **w_cursor)
-{
- struct pack_window *w = *w_cursor;
- if (w) {
- w->inuse_cnt--;
- *w_cursor = NULL;
- }
-}
-
static struct packed_git *alloc_packed_git(int extra)
{
struct packed_git *p = xmalloc(st_add(sizeof(*p), extra));