diff options
author | Junio C Hamano <junkio@cox.net> | 2006-06-03 23:59:27 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-06-03 23:59:27 -0700 |
commit | 16a4c6ee0d9a3d07d4d0afbbc4e3467e78065eca (patch) | |
tree | e76b6ce43feac1834a88737554392cbf3eba04ee /tree-walk.h | |
parent | f0679f474a884df13ce032d81dde34175c0fa343 (diff) | |
parent | 6f9012b62517ca490e4131f24e03ff842527f1b9 (diff) | |
download | git-16a4c6ee0d9a3d07d4d0afbbc4e3467e78065eca.tar.gz git-16a4c6ee0d9a3d07d4d0afbbc4e3467e78065eca.tar.xz |
Merge branch 'lt/tree-2'
* lt/tree-2:
fetch.c: do not call process_tree() from process_tree().
tree_entry(): new tree-walking helper function
adjust to the rebased series by Linus.
Remove "tree->entries" tree-entry list from tree parser
Switch "read_tree_recursive()" over to tree-walk functionality
Make "tree_entry" have a SHA1 instead of a union of object pointers
Add raw tree buffer info to "struct tree"
Remove last vestiges of generic tree_entry_list
Convert fetch.c: process_tree() to raw tree walker
Convert "mark_tree_uninteresting()" to raw tree walker
Remove unused "zeropad" entry from tree_list_entry
fsck-objects: avoid unnecessary tree_entry_list usage
Remove "tree->entries" tree-entry list from tree parser
builtin-read-tree.c: avoid tree_entry_list in prime_cache_tree_rec()
Switch "read_tree_recursive()" over to tree-walk functionality
Make "tree_entry" have a SHA1 instead of a union of object pointers
Make "struct tree" contain the pointer to the tree buffer
Diffstat (limited to 'tree-walk.h')
-rw-r--r-- | tree-walk.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tree-walk.h b/tree-walk.h index 47438fe1c..e57befa4d 100644 --- a/tree-walk.h +++ b/tree-walk.h @@ -2,7 +2,7 @@ #define TREE_WALK_H struct tree_desc { - void *buf; + const void *buf; unsigned long size; }; @@ -16,6 +16,9 @@ struct name_entry { void update_tree_entry(struct tree_desc *); const unsigned char *tree_entry_extract(struct tree_desc *, const char **, unsigned int *); +/* Helper function that does both of the above and returns true for success */ +int tree_entry(struct tree_desc *, struct name_entry *); + void *fill_tree_descriptor(struct tree_desc *desc, const unsigned char *sha1); typedef void (*traverse_callback_t)(int n, unsigned long mask, struct name_entry *entry, const char *base); |