Signed-off-by: Jonathan Tan <jonathantanmy@xxxxxxxxxx> --- cache.h | 1 - pack.h | 4 ++-- packfile.c | 11 ++++++++++- sha1_file.c | 9 --------- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/cache.h b/cache.h index bf93477e8..41562dc0b 100644 --- a/cache.h +++ b/cache.h @@ -1611,7 +1611,6 @@ extern void (*report_garbage)(unsigned seen_bits, const char *path); extern void prepare_packed_git(void); extern void reprepare_packed_git(void); -extern void install_packed_git(struct packed_git *pack); /* * Give a rough count of objects in the repository. This sacrifices accuracy diff --git a/pack.h b/pack.h index c1f3ff32d..576c4fc7c 100644 --- a/pack.h +++ b/pack.h @@ -124,8 +124,6 @@ extern char *sha1_pack_name(const unsigned char *sha1); */ extern char *sha1_pack_index_name(const unsigned char *sha1); -extern unsigned int pack_open_fds; - extern void pack_report(void); /* @@ -152,4 +150,6 @@ extern unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t extern void unuse_pack(struct pack_window **); extern struct packed_git *add_packed_git(const char *path, size_t path_len, int local); +extern void install_packed_git(struct packed_git *pack); + #endif diff --git a/packfile.c b/packfile.c index efe0ed3e8..4eb65e460 100644 --- a/packfile.c +++ b/packfile.c @@ -28,7 +28,7 @@ static unsigned int pack_used_ctr; static unsigned int pack_mmap_calls; static unsigned int peak_pack_open_windows; static unsigned int pack_open_windows; -unsigned int pack_open_fds; +static unsigned int pack_open_fds; static unsigned int pack_max_fds; static size_t peak_pack_mapped; static size_t pack_mapped; @@ -658,3 +658,12 @@ struct packed_git *add_packed_git(const char *path, size_t path_len, int local) hashclr(p->sha1); return p; } + +void install_packed_git(struct packed_git *pack) +{ + if (pack->pack_fd != -1) + pack_open_fds++; + + pack->next = packed_git; + packed_git = pack; +} diff --git a/sha1_file.c b/sha1_file.c index 7f12b1ee0..b956ca0c9 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -717,15 +717,6 @@ void *xmmap(void *start, size_t length, return ret; } -void install_packed_git(struct packed_git *pack) -{ - if (pack->pack_fd != -1) - pack_open_fds++; - - pack->next = packed_git; - packed_git = pack; -} - void (*report_garbage)(unsigned seen_bits, const char *path); static void report_helper(const struct string_list *list, -- 2.14.0.434.g98096fd7a8-goog