From: Pekka Riikonen Date: Wed, 20 Sep 2006 16:47:56 +0000 (+0000) Subject: silc_buffer_sstrformat to preserve buffer locations. X-Git-Tag: 1.2.beta1~695 X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=68668f50599af25a57ebc6ea13131bf5002ed466;p=runtime.git silc_buffer_sstrformat to preserve buffer locations. --- diff --git a/lib/silcutil/silcbuffmt.c b/lib/silcutil/silcbuffmt.c index 4dd54965..902d2805 100644 --- a/lib/silcutil/silcbuffmt.c +++ b/lib/silcutil/silcbuffmt.c @@ -619,6 +619,7 @@ int silc_buffer_strformat(SilcBuffer dst, ...) int silc_buffer_sstrformat(SilcStack stack, SilcBuffer dst, ...) { int len = silc_buffer_truelen(dst); + int hlen = silc_buffer_headlen(dst); va_list va; va_start(va, dst); @@ -651,7 +652,7 @@ int silc_buffer_sstrformat(SilcStack stack, SilcBuffer dst, ...) ok: dst->end = dst->head + len; - dst->data = dst->head; + dst->data = dst->head + hlen; dst->tail = dst->end; va_end(va); diff --git a/lib/silcutil/silcbuffmt.h b/lib/silcutil/silcbuffmt.h index cf0ed7b3..a3ff49dc 100644 --- a/lib/silcutil/silcbuffmt.h +++ b/lib/silcutil/silcbuffmt.h @@ -66,7 +66,7 @@ * silc_buffer_purge(&buffer); * * // Allocate zero size buffer - * buf = silc_buffer_alloc(); + * buf = silc_buffer_alloc(0); * ret = silc_buffer_format(buf, * SILC_STR_INT(intval), * SILC_STR_CHAR(charval),