diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2007-03-21 17:08:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-21 17:21:57 (GMT) |
| commit | 6fda5e5180c2e7c130978361aea53b4e66f36823 (patch) | |
| tree | 89df3a31883fe84ae06d1c05f29fa823614eef87 /builtin-reflog.c | |
| parent | a8c40471ab0851bf9a58f7dc76f121258e0690e2 (diff) | |
| download | git-6fda5e5180c2e7c130978361aea53b4e66f36823.zip git-6fda5e5180c2e7c130978361aea53b4e66f36823.tar.gz git-6fda5e5180c2e7c130978361aea53b4e66f36823.tar.bz2 | |
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>
Diffstat (limited to 'builtin-reflog.c')
| -rw-r--r-- | builtin-reflog.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/builtin-reflog.c b/builtin-reflog.c index 186aabc..4c39f1d 100644 --- a/builtin-reflog.c +++ b/builtin-reflog.c @@ -52,18 +52,18 @@ static int tree_is_complete(const unsigned char *sha1) if (tree->object.flags & INCOMPLETE) return 0; - desc.buf = tree->buffer; - desc.size = tree->size; - if (!desc.buf) { + if (!tree->buffer) { enum object_type type; - void *data = read_sha1_file(sha1, &type, &desc.size); + unsigned long size; + void *data = read_sha1_file(sha1, &type, &size); if (!data) { tree->object.flags |= INCOMPLETE; return 0; } - desc.buf = data; tree->buffer = data; + tree->size = size; } + init_tree_desc(&desc, tree->buffer, tree->size); complete = 1; while (tree_entry(&desc, &entry)) { if (!has_sha1_file(entry.sha1) || |