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
@ -184,8 +184,8 @@ static void *read_patch_file(int fd, unsigned long *sizep)
|
||||
{
|
||||
struct strbuf buf;
|
||||
|
||||
strbuf_init(&buf);
|
||||
if (strbuf_read(&buf, fd) < 0)
|
||||
strbuf_init(&buf, 0);
|
||||
if (strbuf_read(&buf, fd, 0) < 0)
|
||||
die("git-apply: read returned %s", strerror(errno));
|
||||
*sizep = buf.len;
|
||||
|
||||
|
Reference in New Issue
Block a user