diff options
| author | Linus Torvalds <torvalds@osdl.org> | 2006-05-29 12:18:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-29 19:06:59 -0700 |
| commit | 2d9c58c69d1bab601e67b036d0546e85abcee7eb (patch) | |
| tree | 18151bcd75d61a73f72522fc21c85552e49bae2f /fsck-objects.c | |
| parent | 1ccf5a345a6e7974ec0380eed735c2db97e50b4c (diff) | |
| download | git-2d9c58c69d1bab601e67b036d0546e85abcee7eb.tar.gz git-2d9c58c69d1bab601e67b036d0546e85abcee7eb.tar.xz | |
Remove "tree->entries" tree-entry list from tree parser
Instead, just use the tree buffer directly, and use the tree-walk
infrastructure to walk the 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.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'fsck-objects.c')
| -rw-r--r-- | fsck-objects.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fsck-objects.c b/fsck-objects.c index ed2eb278e..42778e87d 100644 --- a/fsck-objects.c +++ b/fsck-objects.c @@ -11,6 +11,7 @@ #include "cache-tree.h" #define REACHABLE 0x0001 +#define SEEN 0x0002 static int show_root = 0; static int show_tags = 0; @@ -161,7 +162,7 @@ static int fsck_tree(struct tree *item) struct tree_entry_list *entry, *last; last = NULL; - for (entry = item->entries; entry; entry = entry->next) { + for (entry = create_tree_entry_list(item); entry; entry = entry->next) { if (strchr(entry->name, '/')) has_full_path = 1; has_zero_pad |= entry->zeropad; @@ -205,7 +206,6 @@ static int fsck_tree(struct tree *item) } if (last) free(last); - item->entries = NULL; free(item->buffer); item->buffer = NULL; @@ -277,6 +277,9 @@ static int fsck_sha1(unsigned char *sha1) struct object *obj = parse_object(sha1); if (!obj) return error("%s: object not found", sha1_to_hex(sha1)); + if (obj->flags & SEEN) + return 0; + obj->flags |= SEEN; if (obj->type == blob_type) return 0; if (obj->type == tree_type) |