Remove last vestiges of generic tree_entry_list
The old tree_entry_list is dead, long live the unified single tree parser. Yes, we now still have a compatibility function to create a bogus tree_entry_list in builtin-read-tree.c, but that is now entirely local to that very messy piece of code. I'd love to clean read-tree.c up too, but I'm too scared right now, so the best I can do is to just contain the damage, and try to make sure that no new users of the tree_entry_list sprout up by not having it as an exported interface any more. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
1bc995a392
commit
15b5536ee4
@ -30,7 +30,17 @@ static int merge_size = 0;
|
|||||||
|
|
||||||
static struct object_list *trees = NULL;
|
static struct object_list *trees = NULL;
|
||||||
|
|
||||||
static struct cache_entry df_conflict_entry = {
|
static struct cache_entry df_conflict_entry = {
|
||||||
|
};
|
||||||
|
|
||||||
|
struct tree_entry_list {
|
||||||
|
struct tree_entry_list *next;
|
||||||
|
unsigned directory : 1;
|
||||||
|
unsigned executable : 1;
|
||||||
|
unsigned symlink : 1;
|
||||||
|
unsigned int mode;
|
||||||
|
const char *name;
|
||||||
|
const unsigned char *sha1;
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct tree_entry_list df_conflict_list = {
|
static struct tree_entry_list df_conflict_list = {
|
||||||
@ -40,6 +50,39 @@ static struct tree_entry_list df_conflict_list = {
|
|||||||
|
|
||||||
typedef int (*merge_fn_t)(struct cache_entry **src);
|
typedef int (*merge_fn_t)(struct cache_entry **src);
|
||||||
|
|
||||||
|
static struct tree_entry_list *create_tree_entry_list(struct tree *tree)
|
||||||
|
{
|
||||||
|
struct tree_desc desc;
|
||||||
|
struct tree_entry_list *ret = NULL;
|
||||||
|
struct tree_entry_list **list_p = &ret;
|
||||||
|
|
||||||
|
desc.buf = tree->buffer;
|
||||||
|
desc.size = tree->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);
|
||||||
|
update_tree_entry(&desc);
|
||||||
|
|
||||||
|
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->next = NULL;
|
||||||
|
|
||||||
|
*list_p = entry;
|
||||||
|
list_p = &entry->next;
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
static int entcmp(const char *name1, int dir1, const char *name2, int dir2)
|
static int entcmp(const char *name1, int dir1, const char *name2, int dir2)
|
||||||
{
|
{
|
||||||
int len1 = strlen(name1);
|
int len1 = strlen(name1);
|
||||||
|
42
tree.c
42
tree.c
@ -201,48 +201,6 @@ int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct tree_entry_list *create_tree_entry_list(struct tree *tree)
|
|
||||||
{
|
|
||||||
struct tree_desc desc;
|
|
||||||
struct tree_entry_list *ret = NULL;
|
|
||||||
struct tree_entry_list **list_p = &ret;
|
|
||||||
|
|
||||||
desc.buf = tree->buffer;
|
|
||||||
desc.size = tree->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);
|
|
||||||
update_tree_entry(&desc);
|
|
||||||
|
|
||||||
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->next = NULL;
|
|
||||||
|
|
||||||
*list_p = entry;
|
|
||||||
list_p = &entry->next;
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
void free_tree_entry_list(struct tree_entry_list *list)
|
|
||||||
{
|
|
||||||
while (list) {
|
|
||||||
struct tree_entry_list *next = list->next;
|
|
||||||
free(list);
|
|
||||||
list = next;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int parse_tree(struct tree *item)
|
int parse_tree(struct tree *item)
|
||||||
{
|
{
|
||||||
char type[20];
|
char type[20];
|
||||||
|
13
tree.h
13
tree.h
@ -5,25 +5,12 @@
|
|||||||
|
|
||||||
extern const char *tree_type;
|
extern const char *tree_type;
|
||||||
|
|
||||||
struct tree_entry_list {
|
|
||||||
struct tree_entry_list *next;
|
|
||||||
unsigned directory : 1;
|
|
||||||
unsigned executable : 1;
|
|
||||||
unsigned symlink : 1;
|
|
||||||
unsigned int mode;
|
|
||||||
const char *name;
|
|
||||||
const unsigned char *sha1;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct tree {
|
struct tree {
|
||||||
struct object object;
|
struct object object;
|
||||||
void *buffer;
|
void *buffer;
|
||||||
unsigned long size;
|
unsigned long size;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct tree_entry_list *create_tree_entry_list(struct tree *);
|
|
||||||
void free_tree_entry_list(struct tree_entry_list *);
|
|
||||||
|
|
||||||
struct tree *lookup_tree(const unsigned char *sha1);
|
struct tree *lookup_tree(const unsigned char *sha1);
|
||||||
|
|
||||||
int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size);
|
int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size);
|
||||||
|
Loading…
Reference in New Issue
Block a user