Initialize tree descriptors with a helper function rather than by hand.
This removes slightly more lines than it adds, but the real reason for doing this is that future optimizations will require more setup of the tree descriptor, and so we want to do it in one place. Also renamed the "desc.buf" field to "desc.buffer" just to trigger compiler errors for old-style manual initializations, making sure I didn't miss anything. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds committed
Mar 21, 2007 at 10:08 UTC
6fda5e5180c2e7c130978361aea53b4e66f36823
15 files changed
+60
-62
builtin-fsck.c
+2
-3
@@ -227,8 +227,7 @@ static int fsck_tree(struct tree *item)
227
const char *o_name;
228
const unsigned char *o_sha1;
229
230
- desc.buf = item->buffer;
231
- desc.size = item->size;
230
+ init_tree_desc(&desc, item->buffer, item->size);
231
232
o_mode = 0;
233
o_name = NULL;
@@ -242,7 +241,7 @@ static int fsck_tree(struct tree *item)
241
242
if (strchr(name, '/'))
243
has_full_path = 1;
245
- has_zero_pad |= *(char *)desc.buf == '0';
244
+ has_zero_pad |= *(char *)desc.buffer == '0';
245
update_tree_entry(&desc);
246
247
switch (mode) {
builtin-grep.c
+7
-4
@@ -388,11 +388,13 @@ static int grep_tree(struct grep_opt *opt, const char **paths,
388
enum object_type type;
389
struct tree_desc sub;
390
void *data;
391
- data = read_sha1_file(entry.sha1, &type, &sub.size);
391
+ unsigned long size;
392
+
393
+ data = read_sha1_file(entry.sha1, &type, &size);
394
if (!data)
395
die("unable to read tree (%s)",
396
sha1_to_hex(entry.sha1));
395
- sub.buf = data;
397
+ init_tree_desc(&sub, data, size);
398
hit |= grep_tree(opt, paths, &sub, tree_name, down);
399
free(data);
400
}
@@ -408,12 +410,13 @@ static int grep_object(struct grep_opt *opt, const char **paths,
410
if (obj->type == OBJ_COMMIT || obj->type == OBJ_TREE) {
411
struct tree_desc tree;
412
void *data;
413
+ unsigned long size;
414
int hit;
415
data = read_object_with_reference(obj->sha1, tree_type,
413
- &tree.size, NULL);
416
+ &size, NULL);
417
if (!data)
418
die("unable to read tree (%s)", sha1_to_hex(obj->sha1));
416
- tree.buf = data;
419
+ init_tree_desc(&tree, data, size);
420
hit = grep_tree(opt, paths, &tree, name, "");
421
free(data);
422
return hit;
builtin-pack-objects.c
+2
-4
@@ -873,8 +873,7 @@ static void add_pbase_object(struct tree_desc *tree,
873
tree = pbase_tree_get(entry.sha1);
874
if (!tree)
875
return;
876
- sub.buf = tree->tree_data;
877
- sub.size = tree->tree_size;
876
+ init_tree_desc(&sub, tree->tree_data, tree->tree_size);
877
878
add_pbase_object(&sub, down, downlen, fullname);
879
pbase_tree_put(tree);
@@ -937,8 +936,7 @@ static void add_preferred_base_object(const char *name, unsigned hash)
936
}
937
else {
938
struct tree_desc tree;
940
- tree.buf = it->pcache.tree_data;
941
- tree.size = it->pcache.tree_size;
939
+ init_tree_desc(&tree, it->pcache.tree_data, it->pcache.tree_size);
940
add_pbase_object(&tree, name, cmplen, name);
941
}
942
}
builtin-read-tree.c
+1
-2
@@ -55,8 +55,7 @@ static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)
55
int cnt;
56
57
hashcpy(it->sha1, tree->object.sha1);
58
- desc.buf = tree->buffer;
59
- desc.size = tree->size;
58
+ init_tree_desc(&desc, tree->buffer, tree->size);
59
cnt = 0;
60
while (tree_entry(&desc, &entry)) {
61
if (!S_ISDIR(entry.mode))
builtin-reflog.c
+5
-5
@@ -52,18 +52,18 @@ static int tree_is_complete(const unsigned char *sha1)
52
if (tree->object.flags & INCOMPLETE)
53
return 0;
54
55
- desc.buf = tree->buffer;
56
- desc.size = tree->size;
57
- if (!desc.buf) {
55
+ if (!tree->buffer) {
56
enum object_type type;
59
- void *data = read_sha1_file(sha1, &type, &desc.size);
57
+ unsigned long size;
58
+ void *data = read_sha1_file(sha1, &type, &size);
59
if (!data) {
60
tree->object.flags |= INCOMPLETE;
61
return 0;
62
}
64
- desc.buf = data;
63
tree->buffer = data;
64
+ tree->size = size;
65
}
66
+ init_tree_desc(&desc, tree->buffer, tree->size);
67
complete = 1;
68
while (tree_entry(&desc, &entry)) {
69
if (!has_sha1_file(entry.sha1) ||
fetch.c
+1
-2
@@ -42,8 +42,7 @@ static int process_tree(struct tree *tree)
42
if (parse_tree(tree))
43
return -1;
44
45
- desc.buf = tree->buffer;
46
- desc.size = tree->size;
45
+ init_tree_desc(&desc, tree->buffer, tree->size);
46
while (tree_entry(&desc, &entry)) {
47
struct object *obj = NULL;
48
http-push.c
+1
-2
@@ -1750,8 +1750,7 @@ static struct object_list **process_tree(struct tree *tree,
1750
me.elem = name;
1751
me.elem_len = strlen(name);
1752
1753
- desc.buf = tree->buffer;
1754
- desc.size = tree->size;
1753
+ init_tree_desc(&desc, tree->buffer, tree->size);
1754
1755
while (tree_entry(&desc, &entry)) {
1756
if (S_ISDIR(entry.mode))
list-objects.c
+1
-2
@@ -49,8 +49,7 @@ static void process_tree(struct rev_info *revs,
49
me.elem = name;
50
me.elem_len = strlen(name);
51
52
- desc.buf = tree->buffer;
53
- desc.size = tree->size;
52
+ init_tree_desc(&desc, tree->buffer, tree->size);
53
54
while (tree_entry(&desc, &entry)) {
55
if (S_ISDIR(entry.mode))
reachable.c
+1
-2
@@ -42,8 +42,7 @@ static void process_tree(struct tree *tree,
42
me.elem = name;
43
me.elem_len = strlen(name);
44
45
- desc.buf = tree->buffer;
46
- desc.size = tree->size;
45
+ init_tree_desc(&desc, tree->buffer, tree->size);
46
47
while (tree_entry(&desc, &entry)) {
48
if (S_ISDIR(entry.mode))
revision.c
+5
-7
@@ -62,8 +62,7 @@ void mark_tree_uninteresting(struct tree *tree)
62
if (parse_tree(tree) < 0)
63
die("bad tree %s", sha1_to_hex(obj->sha1));
64
65
- desc.buf = tree->buffer;
66
- desc.size = tree->size;
65
+ init_tree_desc(&desc, tree->buffer, tree->size);
66
while (tree_entry(&desc, &entry)) {
67
if (S_ISDIR(entry.mode))
68
mark_tree_uninteresting(lookup_tree(entry.sha1));
@@ -275,18 +274,17 @@ int rev_same_tree_as_empty(struct rev_info *revs, struct tree *t1)
274
{
275
int retval;
276
void *tree;
277
+ unsigned long size;
278
struct tree_desc empty, real;
279
280
if (!t1)
281
return 0;
282
283
- tree = read_object_with_reference(t1->object.sha1, tree_type, &real.size, NULL);
283
+ tree = read_object_with_reference(t1->object.sha1, tree_type, &size, NULL);
284
if (!tree)
285
return 0;
286
- real.buf = tree;
287
-
288
- empty.buf = "";
289
- empty.size = 0;
286
+ init_tree_desc(&real, tree, size);
287
+ init_tree_desc(&empty, "", 0);
288
289
tree_difference = REV_TREE_SAME;
290
revs->pruning.has_changes = 0;
tree-diff.c
+12
-10
@@ -154,12 +154,13 @@ static void show_entry(struct diff_options *opt, const char *prefix, struct tree
154
char *newbase = malloc_base(base, baselen, path, pathlen);
155
struct tree_desc inner;
156
void *tree;
157
+ unsigned long size;
158
158
- tree = read_sha1_file(sha1, &type, &inner.size);
159
+ tree = read_sha1_file(sha1, &type, &size);
160
if (!tree || type != OBJ_TREE)
161
die("corrupt tree sha %s", sha1_to_hex(sha1));
162
162
- inner.buf = tree;
163
+ init_tree_desc(&inner, tree, size);
164
show_tree(opt, prefix, &inner, newbase, baselen + 1 + pathlen);
165
166
free(tree);
@@ -227,16 +228,17 @@ int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const cha
228
{
229
void *tree1, *tree2;
230
struct tree_desc t1, t2;
231
+ unsigned long size1, size2;
232
int retval;
233
232
- tree1 = read_object_with_reference(old, tree_type, &t1.size, NULL);
234
+ tree1 = read_object_with_reference(old, tree_type, &size1, NULL);
235
if (!tree1)
236
die("unable to read source tree (%s)", sha1_to_hex(old));
235
- tree2 = read_object_with_reference(new, tree_type, &t2.size, NULL);
237
+ tree2 = read_object_with_reference(new, tree_type, &size2, NULL);
238
if (!tree2)
239
die("unable to read destination tree (%s)", sha1_to_hex(new));
238
- t1.buf = tree1;
239
- t2.buf = tree2;
240
+ init_tree_desc(&t1, tree1, size1);
241
+ init_tree_desc(&t2, tree2, size2);
242
retval = diff_tree(&t1, &t2, base, opt);
243
free(tree1);
244
free(tree2);
@@ -247,15 +249,15 @@ int diff_root_tree_sha1(const unsigned char *new, const char *base, struct diff_
249
{
250
int retval;
251
void *tree;
252
+ unsigned long size;
253
struct tree_desc empty, real;
254
252
- tree = read_object_with_reference(new, tree_type, &real.size, NULL);
255
+ tree = read_object_with_reference(new, tree_type, &size, NULL);
256
if (!tree)
257
die("unable to read root tree (%s)", sha1_to_hex(new));
255
- real.buf = tree;
258
+ init_tree_desc(&real, tree, size);
259
257
- empty.size = 0;
258
- empty.buf = "";
260
+ init_tree_desc(&empty, "", 0);
261
retval = diff_tree(&empty, &real, base, opt);
262
free(tree);
263
return retval;
tree-walk.c
+15
-9
@@ -2,6 +2,12 @@
2
#include "tree-walk.h"
3
#include "tree.h"
4
5
+void init_tree_desc(struct tree_desc *desc, const void *buffer, unsigned long size)
6
+{
7
+ desc->buffer = buffer;
8
+ desc->size = size;
9
+}
10
+
11
void *fill_tree_descriptor(struct tree_desc *desc, const unsigned char *sha1)
12
{
13
unsigned long size = 0;
@@ -12,8 +18,7 @@ void *fill_tree_descriptor(struct tree_desc *desc, const unsigned char *sha1)
18
if (!buf)
19
die("unable to read tree %s", sha1_to_hex(sha1));
20
}
15
- desc->size = size;
16
- desc->buf = buf;
21
+ init_tree_desc(desc, buf, size);
22
return buf;
23
}
24
@@ -36,13 +41,13 @@ static void entry_extract(struct tree_desc *t, struct name_entry *a)
41
42
void update_tree_entry(struct tree_desc *desc)
43
{
39
- const void *buf = desc->buf;
44
+ const void *buf = desc->buffer;
45
unsigned long size = desc->size;
46
int len = strlen(buf) + 1 + 20;
47
48
if (size < len)
49
die("corrupt tree file");
45
- desc->buf = (char *) buf + len;
50
+ desc->buffer = (char *) buf + len;
51
desc->size = size - len;
52
}
53
@@ -62,7 +67,7 @@ static const char *get_mode(const char *str, unsigned int *modep)
67
68
const unsigned char *tree_entry_extract(struct tree_desc *desc, const char **pathp, unsigned int *modep)
69
{
65
- const void *tree = desc->buf;
70
+ const void *tree = desc->buffer;
71
unsigned long size = desc->size;
72
int len = strlen(tree)+1;
73
const unsigned char *sha1 = (unsigned char *) tree + len;
@@ -79,7 +84,7 @@ const unsigned char *tree_entry_extract(struct tree_desc *desc, const char **pat
84
85
int tree_entry(struct tree_desc *desc, struct name_entry *entry)
86
{
82
- const void *tree = desc->buf;
87
+ const void *tree = desc->buffer;
88
const char *path;
89
unsigned long len, size = desc->size;
90
@@ -101,7 +106,7 @@ int tree_entry(struct tree_desc *desc, struct name_entry *entry)
106
if (len > size)
107
die("corrupt tree file");
108
104
- desc->buf = path;
109
+ desc->buffer = path;
110
desc->size = size - len;
111
return 1;
112
}
@@ -196,10 +201,11 @@ int get_tree_entry(const unsigned char *tree_sha1, const char *name, unsigned ch
201
{
202
int retval;
203
void *tree;
204
+ unsigned long size;
205
struct tree_desc t;
206
unsigned char root[20];
207
202
- tree = read_object_with_reference(tree_sha1, tree_type, &t.size, root);
208
+ tree = read_object_with_reference(tree_sha1, tree_type, &size, root);
209
if (!tree)
210
return -1;
211
@@ -208,7 +214,7 @@ int get_tree_entry(const unsigned char *tree_sha1, const char *name, unsigned ch
214
return 0;
215
}
216
211
- t.buf = tree;
217
+ init_tree_desc(&t, tree, size);
218
retval = find_tree_entry(&t, name, sha1, mode);
219
free(tree);
220
return retval;
tree-walk.h
+3
-2
@@ -2,8 +2,8 @@
2
#define TREE_WALK_H
3
4
struct tree_desc {
5
- const void *buf;
6
- unsigned long size;
5
+ const void *buffer;
6
+ unsigned int size;
7
};
8
9
struct name_entry {
@@ -18,6 +18,7 @@ static inline int tree_entry_len(const char *name, const unsigned char *sha1)
18
}
19
20
void update_tree_entry(struct tree_desc *);
21
+void init_tree_desc(struct tree_desc *desc, const void *buf, unsigned long size);
22
const unsigned char *tree_entry_extract(struct tree_desc *, const char **, unsigned int *);
23
24
/* Helper function that does both of the above and returns true for success */
tree.c
+3
-6
@@ -83,8 +83,7 @@ int read_tree_recursive(struct tree *tree,
83
if (parse_tree(tree))
84
return -1;
85
86
- desc.buf = tree->buffer;
87
- desc.size = tree->size;
86
+ init_tree_desc(&desc, tree->buffer, tree->size);
87
88
while (tree_entry(&desc, &entry)) {
89
if (!match_tree_entry(base, baselen, entry.path, entry.mode, match))
@@ -152,16 +151,14 @@ static void track_tree_refs(struct tree *item)
151
struct name_entry entry;
152
153
/* Count how many entries there are.. */
155
- desc.buf = item->buffer;
156
- desc.size = item->size;
154
+ init_tree_desc(&desc, item->buffer, item->size);
155
while (tree_entry(&desc, &entry))
156
n_refs++;
157
158
/* Allocate object refs and walk it again.. */
159
i = 0;
160
refs = alloc_object_refs(n_refs);
163
- desc.buf = item->buffer;
164
- desc.size = item->size;
161
+ init_tree_desc(&desc, item->buffer, item->size);
162
while (tree_entry(&desc, &entry)) {
163
struct object *obj;
164
unpack-trees.c
+1
-2
@@ -27,8 +27,7 @@ static struct tree_entry_list *create_tree_entry_list(struct tree *tree)
27
if (!tree->object.parsed)
28
parse_tree(tree);
29
30
- desc.buf = tree->buffer;
31
- desc.size = tree->size;
30
+ init_tree_desc(&desc, tree->buffer, tree->size);
31
32
while (tree_entry(&desc, &one)) {
33
struct tree_entry_list *entry;