summaryrefslogtreecommitdiff
path: root/cache-tree.c
diff options
context:
space:
mode:
authorPierre Habouzit <madcoder@debian.org>2007-09-10 10:35:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-09-10 19:48:24 (GMT)
commitf1696ee398e92bcea3cdc7b3da85d8e0f77f6c50 (patch)
tree5951ed29b6f7bc887c4e5c75bf87b258232d1a76 /cache-tree.c
parentddb95de33e99d547c3b533aea12f18c9e4dd649e (diff)
downloadgit-f1696ee398e92bcea3cdc7b3da85d8e0f77f6c50.zip
git-f1696ee398e92bcea3cdc7b3da85d8e0f77f6c50.tar.gz
git-f1696ee398e92bcea3cdc7b3da85d8e0f77f6c50.tar.bz2
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>
Diffstat (limited to 'cache-tree.c')
-rw-r--r--cache-tree.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/cache-tree.c b/cache-tree.c
index 76af6f5..8f53c99 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -293,8 +293,7 @@ static int update_one(struct cache_tree *it,
/*
* Then write out the tree object for this level.
*/
- strbuf_init(&buffer);
- strbuf_grow(&buffer, 8192);
+ strbuf_init(&buffer, 8192);
for (i = 0; i < entries; i++) {
struct cache_entry *ce = cache[i];
@@ -419,7 +418,7 @@ void *cache_tree_write(struct cache_tree *root, unsigned long *size_p)
struct strbuf buffer;
path[0] = 0;
- strbuf_init(&buffer);
+ strbuf_init(&buffer, 0);
write_one(root, path, 0, &buffer);
*size_p = buffer.len;
return strbuf_detach(&buffer);