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>
Linus Torvalds committed
May 29, 2006 at 12:21 UTC
15b5536ee47c6684806edd7725adbbdede9fb95c
3 files changed
+44
-56
builtin-read-tree.c
+44
-1
@@ -30,7 +30,17 @@ static int merge_size = 0;
30
31
static struct object_list *trees = NULL;
32
33
-static struct cache_entry df_conflict_entry = {
33
+static struct cache_entry df_conflict_entry = {
34
+};
35
+
36
+struct tree_entry_list {
37
+ struct tree_entry_list *next;
38
+ unsigned directory : 1;
39
+ unsigned executable : 1;
40
+ unsigned symlink : 1;
41
+ unsigned int mode;
42
+ const char *name;
43
+ const unsigned char *sha1;
44
};
45
46
static struct tree_entry_list df_conflict_list = {
@@ -40,6 +50,39 @@ static struct tree_entry_list df_conflict_list = {
50
51
typedef int (*merge_fn_t)(struct cache_entry **src);
52
53
+static struct tree_entry_list *create_tree_entry_list(struct tree *tree)
54
+{
55
+ struct tree_desc desc;
56
+ struct tree_entry_list *ret = NULL;
57
+ struct tree_entry_list **list_p = &ret;
58
+
59
+ desc.buf = tree->buffer;
60
+ desc.size = tree->size;
61
+
62
+ while (desc.size) {
63
+ unsigned mode;
64
+ const char *path;
65
+ const unsigned char *sha1;
66
+ struct tree_entry_list *entry;
67
+
68
+ sha1 = tree_entry_extract(&desc, &path, &mode);
69
+ update_tree_entry(&desc);
70
+
71
+ entry = xmalloc(sizeof(struct tree_entry_list));
72
+ entry->name = path;
73
+ entry->sha1 = sha1;
74
+ entry->mode = mode;
75
+ entry->directory = S_ISDIR(mode) != 0;
76
+ entry->executable = (mode & S_IXUSR) != 0;
77
+ entry->symlink = S_ISLNK(mode) != 0;
78
+ entry->next = NULL;
79
+
80
+ *list_p = entry;
81
+ list_p = &entry->next;
82
+ }
83
+ return ret;
84
+}
85
+
86
static int entcmp(const char *name1, int dir1, const char *name2, int dir2)
87
{
88
int len1 = strlen(name1);
tree.c
-42
@@ -201,48 +201,6 @@ int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size)
201
return 0;
202
}
203
204
-struct tree_entry_list *create_tree_entry_list(struct tree *tree)
205
-{
206
- struct tree_desc desc;
207
- struct tree_entry_list *ret = NULL;
208
- struct tree_entry_list **list_p = &ret;
209
-
210
- desc.buf = tree->buffer;
211
- desc.size = tree->size;
212
-
213
- while (desc.size) {
214
- unsigned mode;
215
- const char *path;
216
- const unsigned char *sha1;
217
- struct tree_entry_list *entry;
218
-
219
- sha1 = tree_entry_extract(&desc, &path, &mode);
220
- update_tree_entry(&desc);
221
-
222
- entry = xmalloc(sizeof(struct tree_entry_list));
223
- entry->name = path;
224
- entry->sha1 = sha1;
225
- entry->mode = mode;
226
- entry->directory = S_ISDIR(mode) != 0;
227
- entry->executable = (mode & S_IXUSR) != 0;
228
- entry->symlink = S_ISLNK(mode) != 0;
229
- entry->next = NULL;
230
-
231
- *list_p = entry;
232
- list_p = &entry->next;
233
- }
234
- return ret;
235
-}
236
-
237
-void free_tree_entry_list(struct tree_entry_list *list)
238
-{
239
- while (list) {
240
- struct tree_entry_list *next = list->next;
241
- free(list);
242
- list = next;
243
- }
244
-}
245
-
204
int parse_tree(struct tree *item)
205
{
206
char type[20];
tree.h
-13
@@ -5,25 +5,12 @@
5
6
extern const char *tree_type;
7
8
-struct tree_entry_list {
9
- struct tree_entry_list *next;
10
- unsigned directory : 1;
11
- unsigned executable : 1;
12
- unsigned symlink : 1;
13
- unsigned int mode;
14
- const char *name;
15
- const unsigned char *sha1;
16
-};
17
-
8
struct tree {
9
struct object object;
10
void *buffer;
11
unsigned long size;
12
};
13
24
-struct tree_entry_list *create_tree_entry_list(struct tree *);
25
-void free_tree_entry_list(struct tree_entry_list *);
26
-
14
struct tree *lookup_tree(const unsigned char *sha1);
15
16
int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size);