path: root/fast-import.c
diff options
authorPierre Habouzit <>2007-09-10 10:35:04 (GMT)
committerJunio C Hamano <>2007-09-10 19:48:24 (GMT)
commitf1696ee398e92bcea3cdc7b3da85d8e0f77f6c50 (patch)
tree5951ed29b6f7bc887c4e5c75bf87b258232d1a76 /fast-import.c
parentddb95de33e99d547c3b533aea12f18c9e4dd649e (diff)
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 <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'fast-import.c')
1 files changed, 2 insertions, 2 deletions
diff --git a/fast-import.c b/fast-import.c
index 74ff0fd..2c0bfb9 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1640,7 +1640,7 @@ static void *cmd_data (size_t *size)
struct strbuf buffer;
- strbuf_init(&buffer);
+ strbuf_init(&buffer, 0);
if (prefixcmp(command_buf.buf, "data "))
die("Expected 'data n' command, found: %s", command_buf.buf);
@@ -2318,7 +2318,7 @@ int main(int argc, const char **argv)
- strbuf_init(&command_buf);
+ strbuf_init(&command_buf, 0);
atom_table = xcalloc(atom_table_sz, sizeof(struct atom_str*));
branch_table = xcalloc(branch_table_sz, sizeof(struct branch*));
avail_tree_table = xcalloc(avail_tree_table_sz, sizeof(struct avail_tree_content*));