patch: use strlen to mean string length

[libgit2.git] / src / tree.h

diff --git a/src/tree.h b/src/tree.h
index 27afd4fd4d4cf4b29e77a7521c340bd731f51127..5e7a66e045b3e6da6ff49b626f8ee5556cb7ff1b 100644 (file)
--- a/src/tree.h
+++ b/src/tree.h
@@ -11,29 +11,27 @@
 #include "repository.h"
 #include "odb.h"
 #include "vector.h"
+#include "strmap.h"
+#include "pool.h"
 
 struct git_tree_entry {
-       uint16_t removed;
        uint16_t attr;
-       git_oid oid;
-       size_t filename_len;
-       char filename[1];
+       uint16_t filename_len;
+       const git_oid *oid;
+       const char *filename;
 };
 
 struct git_tree {
        git_object object;
-       git_vector entries;
+       git_odb_object *odb_obj;
+       git_array_t(git_tree_entry) entries;
 };
 
 struct git_treebuilder {
-       git_vector entries;
+       git_repository *repo;
+       git_strmap *map;
 };
 
-GIT_INLINE(int) git_tree__dup(git_tree **dest, git_tree *source)
-{
-       return git_object__dup((git_object **)dest, (git_object *)source);
-}
-
 GIT_INLINE(bool) git_tree_entry__is_tree(const struct git_tree_entry *e)
 {
        return (S_ISDIR(e->attr) && !S_ISGITLINK(e->attr));
@@ -41,8 +39,8 @@ GIT_INLINE(bool) git_tree_entry__is_tree(const struct git_tree_entry *e)
 
 extern int git_tree_entry_icmp(const git_tree_entry *e1, const git_tree_entry *e2);
 
-void git_tree__free(git_tree *tree);
-int git_tree__parse(git_tree *tree, git_odb_object *obj);
+void git_tree__free(void *tree);
+int git_tree__parse(void *tree, git_odb_object *obj);
 
 /**
  * Lookup the first position in the tree with a given prefix.
@@ -51,7 +49,7 @@ int git_tree__parse(git_tree *tree, git_odb_object *obj);
  * @param prefix the beginning of a path to find in the tree.
  * @return index of the first item at or after the given prefix.
  */
-int git_tree__prefix_position(git_tree *tree, const char *prefix);
+int git_tree__prefix_position(const git_tree *tree, const char *prefix);
 
 
 /**