X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d6b2ae5fa68b9a82ffc006c233aef64c5cdb3bd2..1dd5d4f0686b560d0bfe86a03000675a11d3ce15:/sbr/charstring.c diff --git a/sbr/charstring.c b/sbr/charstring.c index d94961aa..b9b94bd9 100644 --- a/sbr/charstring.c +++ b/sbr/charstring.c @@ -1,5 +1,4 @@ -/* - * charstring -- dynamically-sized char array that can report size +/* charstring.c -- dynamically-sized char array that can report size * in both characters and bytes * * This code is Copyright (c) 2014, by the authors of nmh. See the @@ -42,8 +41,9 @@ charstring_reserve (charstring_t s, size_t need) { */ charstring_t charstring_create (size_t max) { - charstring_t s = mh_xmalloc (sizeof *s); + charstring_t s; + NEW(s); s->max = NMH_MAX_CHARWIDTH * (max ? max : CHARSTRING_DEFAULT_SIZE); s->cur = s->buffer = mh_xmalloc (s->max); s->chars = 0; @@ -54,8 +54,9 @@ charstring_create (size_t max) { charstring_t charstring_copy (const charstring_t src) { const size_t num = src->cur - src->buffer; - charstring_t s = mh_xmalloc (sizeof *s); + charstring_t s; + NEW(s); s->max = src->max; s->buffer = mh_xmalloc (s->max); memcpy (s->buffer, src->buffer, num);