Re: [PATCH 2/8] strbuf: add strbuf_addv
- From
Christian Couder <christian.couder@gmail.com>
- Date
- Feb 24, 2011, 15:05 UTC
- Message-ID
- <AANLkTi=cBkH5=fmH-k=Sid_4Pwzoa9A4T9z8dcMAjirL@mail.gmail.com>
- In-Reply-To
- <20110224142711.GB15477@sigill.intra.peff.net>
Hi,
On Thu, Feb 24, 2011 at 3:27 PM, Jeff King <peff@peff.net> wrote:
Show 16 quoted lines
> +void strbuf_addv(struct strbuf *sb, const char *fmt, va_list ap)
> +{
> + int len;
> + va_list cp;
>
> if (!strbuf_avail(sb))
> strbuf_grow(sb, 64);
> - va_start(ap, fmt);
> - len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);
> - va_end(ap);
> + va_copy(cp, ap);
> + len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, cp);
> + va_end(cp);
> if (len < 0)
> - die("your vsnprintf is broken");
> + die("BUG: your vsnprintf is broken (returned -1)");Minor nit: why not:
+ die("BUG: your vsnprintf is broken (returned %d)", len);Thanks, Christian.