summaryrefslogtreecommitdiff
path: root/fetch.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2006-05-28 15:13:53 -0700
committerJunio C Hamano <junkio@cox.net>2006-05-28 19:40:18 -0700
commit097dc3d8c32f4b85bf9701d5e1de98999ac25c1c (patch)
treeff76950b6b938324ccc9ed0fc94e130d9df5de77 /fetch.c
parent2522c13244c13fe3a9f0769ea6294dce08e6596c (diff)
downloadgit-097dc3d8c32f4b85bf9701d5e1de98999ac25c1c.tar.gz
Remove "tree->entries" tree-entry list from tree parser
This finally removes the tree-entry list from "struct tree", since most of the users can just use the tree-walk infrastructure to walk the raw tree buffers instead of the tree-entry list. The tree-entry list is inefficient, and generates tons of small allocations for no good reason. The tree-walk infrastructure is generally no harder to use than following a linked list, and allows us to do most tree parsing in-place. Some programs still use the old tree-entry lists, and are a bit painful to convert without major surgery. For them we have a helper function that creates a temporary tree-entry list on demand. We can convert those too eventually, but with this they no longer affect any users who don't need the explicit lists. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'fetch.c')
-rw-r--r--fetch.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/fetch.c b/fetch.c
index f7f8902580..d9fe41f34f 100644
--- a/fetch.c
+++ b/fetch.c
@@ -41,16 +41,22 @@ static int process_tree(struct tree *tree)
if (parse_tree(tree))
return -1;
- entry = tree->entries;
- tree->entries = NULL;
+ entry = create_tree_entry_list(tree);
while (entry) {
struct tree_entry_list *next = entry->next;
- if (process(entry->item.any))
- return -1;
- free(entry->name);
+
+ if (entry->directory) {
+ struct tree *tree = lookup_tree(entry->sha1);
+ process_tree(tree);
+ } else {
+ struct blob *blob = lookup_blob(entry->sha1);
+ process(&blob->object);
+ }
free(entry);
entry = next;
}
+ free(tree->buffer);
+ tree->buffer = NULL;
return 0;
}