X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ficu_utf16.c;h=0b3e3b9e5d021f747e9da87d3f454d41a02e70c5;hb=00537b483d646bd04a204708ecbde708861f044e;hp=55766a210e9879ae03c4ad49fb2486bd0c212058;hpb=54bd147d353f7f340a48a9da5c6a568446223371;p=yaz-moved-to-github.git diff --git a/src/icu_utf16.c b/src/icu_utf16.c index 55766a2..0b3e3b9 100644 --- a/src/icu_utf16.c +++ b/src/icu_utf16.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2009 Index Data + * Copyright (C) 1995-2012 Index Data * See the file LICENSE for details. */ @@ -28,7 +28,7 @@ struct icu_buf_utf16 * icu_buf_utf16_create(size_t capacity) { - struct icu_buf_utf16 * buf16 + struct icu_buf_utf16 * buf16 = (struct icu_buf_utf16 *) xmalloc(sizeof(struct icu_buf_utf16)); buf16->utf16 = 0; @@ -60,18 +60,18 @@ struct icu_buf_utf16 * icu_buf_utf16_resize(struct icu_buf_utf16 * buf16, { if (!buf16) return 0; - - if (capacity > 0) + + if (capacity > 0) { if (0 == buf16->utf16) buf16->utf16 = (UChar *) xmalloc(sizeof(UChar) * capacity); else - buf16->utf16 + buf16->utf16 = (UChar *) xrealloc(buf16->utf16, sizeof(UChar) * capacity); icu_buf_utf16_clear(buf16); buf16->utf16_cap = capacity; - } + } else { xfree(buf16->utf16); @@ -79,13 +79,12 @@ struct icu_buf_utf16 * icu_buf_utf16_resize(struct icu_buf_utf16 * buf16, buf16->utf16_len = 0; buf16->utf16_cap = 0; } - return buf16; } struct icu_buf_utf16 * icu_buf_utf16_copy(struct icu_buf_utf16 * dest16, - struct icu_buf_utf16 * src16) + const struct icu_buf_utf16 * src16) { if (!dest16 || !src16 || dest16 == src16) return 0;