dir-iterator: refactor state machine model

diff --git a/packfile.h b/packfile.h
index fe05fe0303f857374610d3b45c03494e46073d81..b678d35c0b6df11623f2d29f7b7ea7dfe0e1bea1 100644 (file)
--- a/packfile.h
+++ b/packfile.h
@@ -63,7 +63,8 @@ struct packed_git *get_all_packs(struct repository *r);
  * Give a rough count of objects in the repository. This sacrifices accuracy
  * for speed.
  */
-unsigned long approximate_object_count(void);
+unsigned long repo_approximate_object_count(struct repository *r);
+#define approximate_object_count() repo_approximate_object_count(the_repository)
 
 struct packed_git *find_sha1_pack(const unsigned char *sha1,
                                  struct packed_git *packs);
@@ -82,6 +83,8 @@ int open_pack_index(struct packed_git *);
  */
 void close_pack_index(struct packed_git *);
 
+int close_pack_fd(struct packed_git *p);
+
 uint32_t get_pack_fanout(struct packed_git *p, uint32_t value);
 
 unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t, unsigned long *);