@matheusbsbs / matheus-bagliano / commits / d52bc66152
Fork 0

mktree: Simplify write_tree() using strbuf API

Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Pierre Habouzit committed Sep 6, 2007 at 13:20 UTC d52bc66152834dff3fb5f32a54f6ed57730f58c6
1 file changed +8 -15
mktree.c
+8 -15
@@ -44,30 +44,23 @@ static int ent_compare(const void *a_, const void *b_)
44
45 static void write_tree(unsigned char *sha1)
46 {
47 - char *buffer;
48 - unsigned long size, offset;
47 + struct strbuf buf;
48 + size_t size;
49 int i;
50
51 qsort(entries, used, sizeof(*entries), ent_compare);
52 for (size = i = 0; i < used; i++)
53 size += 32 + entries[i]->len;
54 - buffer = xmalloc(size);
55 - offset = 0;
54 + strbuf_init(&buf);
55 + strbuf_grow(&buf, size);
56
57 for (i = 0; i < used; i++) {
58 struct treeent *ent = entries[i];
59 -
60 - if (offset + ent->len + 100 < size) {
61 - size = alloc_nr(offset + ent->len + 100);
62 - buffer = xrealloc(buffer, size);
63 - }
64 - offset += sprintf(buffer + offset, "%o ", ent->mode);
65 - offset += sprintf(buffer + offset, "%s", ent->name);
66 - buffer[offset++] = 0;
67 - hashcpy((unsigned char*)buffer + offset, ent->sha1);
68 - offset += 20;
59 + strbuf_addf(&buf, "%o %s%c", ent->mode, ent->name, '\0');
60 + strbuf_add(&buf, ent->sha1, 20);
61 }
70 - write_sha1_file(buffer, offset, tree_type, sha1);
62 +
63 + write_sha1_file(buf.buf, buf.len, tree_type, sha1);
64 }
65
66 static const char mktree_usage[] = "git-mktree [-z]";