X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=tree.c;h=64422fd27e3f855b7989bc8cb9a6a0ada7a30472;hp=88f8fd58928ce699fbb6ee15f4dda2d9f08d2c5e;hb=HEAD;hpb=0790a42a502701c7b58e9ad4123e46bf46bbf319

diff --git a/tree.c b/tree.c
index 88f8fd58..64422fd2 100644
--- a/tree.c
+++ b/tree.c
@@ -79,6 +79,7 @@ int read_tree_recursive(struct tree *tree,
 			read_tree_fn_t fn)
 {
 	struct tree_desc desc;
+	struct name_entry entry;
 
 	if (parse_tree(tree))
 		return -1;
@@ -86,18 +87,11 @@ int read_tree_recursive(struct tree *tree,
 	desc.buf = tree->buffer;
 	desc.size = tree->size;
 
-	while (desc.size) {
-		unsigned mode;
-		const char *name;
-		const unsigned char *sha1;
-
-		sha1 = tree_entry_extract(&desc, &name, &mode);
-		update_tree_entry(&desc);
-
-		if (!match_tree_entry(base, baselen, name, mode, match))
+	while (tree_entry(&desc, &entry)) {
+		if (!match_tree_entry(base, baselen, entry.path, entry.mode, match))
 			continue;
 
-		switch (fn(sha1, base, baselen, name, mode, stage)) {
+		switch (fn(entry.sha1, base, baselen, entry.path, entry.mode, stage)) {
 		case 0:
 			continue;
 		case READ_TREE_RECURSIVE:
@@ -105,18 +99,17 @@ int read_tree_recursive(struct tree *tree,
 		default:
 			return -1;
 		}
-		if (S_ISDIR(mode)) {
+		if (S_ISDIR(entry.mode)) {
 			int retval;
-			int pathlen = strlen(name);
 			char *newbase;
 
-			newbase = xmalloc(baselen + 1 + pathlen);
+			newbase = xmalloc(baselen + 1 + entry.pathlen);
 			memcpy(newbase, base, baselen);
-			memcpy(newbase + baselen, name, pathlen);
-			newbase[baselen + pathlen] = '/';
-			retval = read_tree_recursive(lookup_tree(sha1),
+			memcpy(newbase + baselen, entry.path, entry.pathlen);
+			newbase[baselen + entry.pathlen] = '/';
+			retval = read_tree_recursive(lookup_tree(entry.sha1),
 						     newbase,
-						     baselen + pathlen + 1,
+						     baselen + entry.pathlen + 1,
 						     stage, match, fn);
 			free(newbase);
 			if (retval)
@@ -138,76 +131,62 @@ struct tree *lookup_tree(const unsigned char *sha1)
 	if (!obj) {
 		struct tree *ret = xcalloc(1, sizeof(struct tree));
 		created_object(sha1, &ret->object);
-		ret->object.type = tree_type;
+		ret->object.type = TYPE_TREE;
 		return ret;
 	}
 	if (!obj->type)
-		obj->type = tree_type;
-	if (obj->type != tree_type) {
-		error("Object %s is a %s, not a tree", 
-		      sha1_to_hex(sha1), obj->type);
+		obj->type = TYPE_TREE;
+	if (obj->type != TYPE_TREE) {
+		error("Object %s is a %s, not a tree",
+		      sha1_to_hex(sha1), typename(obj->type));
 		return NULL;
 	}
 	return (struct tree *) obj;
 }
 
-int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size)
+static int track_tree_refs(struct tree *item)
 {
+	int n_refs = 0, i;
+	struct object_refs *refs;
 	struct tree_desc desc;
-	struct tree_entry_list **list_p;
-	int n_refs = 0;
-
-	if (item->object.parsed)
-		return 0;
-	item->object.parsed = 1;
-	item->buffer = buffer;
-	item->size = size;
+	struct name_entry entry;
 
-	desc.buf = buffer;
-	desc.size = size;
-
-	list_p = &item->entries;
+	/* Count how many entries there are.. */
+	desc.buf = item->buffer;
+	desc.size = item->size;
 	while (desc.size) {
-		unsigned mode;
-		const char *path;
-		const unsigned char *sha1;
-		struct tree_entry_list *entry;
-
-		sha1 = tree_entry_extract(&desc, &path, &mode);
-
-		entry = xmalloc(sizeof(struct tree_entry_list));
-		entry->name = path;
-		entry->sha1 = sha1;
-		entry->mode = mode;
-		entry->directory = S_ISDIR(mode) != 0;
-		entry->executable = (mode & S_IXUSR) != 0;
-		entry->symlink = S_ISLNK(mode) != 0;
-		entry->zeropad = *(const char *)(desc.buf) == '0';
-		entry->next = NULL;
-
-		update_tree_entry(&desc);
 		n_refs++;
-		*list_p = entry;
-		list_p = &entry->next;
+		update_tree_entry(&desc);
 	}
 
-	if (track_object_refs) {
-		struct tree_entry_list *entry;
-		unsigned i = 0;
-		struct object_refs *refs = alloc_object_refs(n_refs);
-		for (entry = item->entries; entry; entry = entry->next) {
-			struct object *obj;
-
-			if (entry->directory)
-				obj = &lookup_tree(entry->sha1)->object;
-			else
-				obj = &lookup_blob(entry->sha1)->object;
-			refs->ref[i++] = obj;
-		}
+	/* Allocate object refs and walk it again.. */
+	i = 0;
+	refs = alloc_object_refs(n_refs);
+	desc.buf = item->buffer;
+	desc.size = item->size;
+	while (tree_entry(&desc, &entry)) {
+		struct object *obj;
 
-		set_object_refs(&item->object, refs);
+		if (S_ISDIR(entry.mode))
+			obj = &lookup_tree(entry.sha1)->object;
+		else
+			obj = &lookup_blob(entry.sha1)->object;
+		refs->ref[i++] = obj;
 	}
+	set_object_refs(&item->object, refs);
+	return 0;
+}
+
+int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size)
+{
+	if (item->object.parsed)
+		return 0;
+	item->object.parsed = 1;
+	item->buffer = buffer;
+	item->size = size;
 
+	if (track_object_refs)
+		track_tree_refs(item);
 	return 0;
 }
 
@@ -237,11 +216,11 @@ struct tree *parse_tree_indirect(const unsigned char *sha1)
 	do {
 		if (!obj)
 			return NULL;
-		if (obj->type == tree_type)
+		if (obj->type == TYPE_TREE)
 			return (struct tree *) obj;
-		else if (obj->type == commit_type)
+		else if (obj->type == TYPE_COMMIT)
 			obj = &(((struct commit *) obj)->tree->object);
-		else if (obj->type == tag_type)
+		else if (obj->type == TYPE_TAG)
 			obj = ((struct tag *) obj)->tagged;
 		else
 			return NULL;