Strbuf API extensions and fixes.
* Add strbuf_rtrim to remove trailing spaces. * Add strbuf_insert to insert data at a given position. * Off-by one fix in strbuf_addf: strbuf_avail() does not counts the final \0 so the overflow test for snprintf is the strict comparison. This is not critical as the growth mechanism chosen will always allocate _more_ memory than asked, so the second test will not fail. It's some kind of miracle though. * Add size extension hints for strbuf_init and strbuf_read. If 0, default applies, else: + initial buffer has the given size for strbuf_init. + first growth checks it has at least this size rather than the default 8192. Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
ddb95de33e
commit
f1696ee398
5
mktree.c
5
mktree.c
@ -51,9 +51,8 @@ static void write_tree(unsigned char *sha1)
|
||||
qsort(entries, used, sizeof(*entries), ent_compare);
|
||||
for (size = i = 0; i < used; i++)
|
||||
size += 32 + entries[i]->len;
|
||||
strbuf_init(&buf);
|
||||
strbuf_grow(&buf, size);
|
||||
|
||||
strbuf_init(&buf, size);
|
||||
for (i = 0; i < used; i++) {
|
||||
struct treeent *ent = entries[i];
|
||||
strbuf_addf(&buf, "%o %s%c", ent->mode, ent->name, '\0');
|
||||
@ -83,7 +82,7 @@ int main(int ac, char **av)
|
||||
av++;
|
||||
}
|
||||
|
||||
strbuf_init(&sb);
|
||||
strbuf_init(&sb, 0);
|
||||
while (1) {
|
||||
char *ptr, *ntr;
|
||||
unsigned mode;
|
||||
|
Reference in New Issue
Block a user