X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Ficu_transform.c;h=6879bc4cea9b3e18b16c10cec55f11b96478cf44;hp=b7ae9c3af9f013732902c290c9e5d40949140850;hb=dbc40ad16aa82379d2884e106d79c7d83312667a;hpb=527a008f2f3b1a19a968a7a1275132a04aa4d945 diff --git a/src/icu_transform.c b/src/icu_transform.c index b7ae9c3..6879bc4 100644 --- a/src/icu_transform.c +++ b/src/icu_transform.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2010 Index Data + * Copyright (C) 1995-2013 Index Data * See the file LICENSE for details. */ @@ -37,7 +37,7 @@ struct icu_transform *icu_transform_clone(struct icu_transform *old) { struct icu_transform *transform = (struct icu_transform *) xmalloc(sizeof(struct icu_transform)); - UErrorCode status; + UErrorCode status = U_ZERO_ERROR; assert(old); transform->action = old->action; assert(old->trans); @@ -47,7 +47,7 @@ struct icu_transform *icu_transform_clone(struct icu_transform *old) } struct icu_transform * icu_transform_create(const char *id, char action, - const char *rules, + const char *rules, UErrorCode *status) { struct icu_buf_utf16 *id16 = icu_buf_utf16_create(0); @@ -61,6 +61,7 @@ struct icu_transform * icu_transform_create(const char *id, char action, if (id) icu_utf16_from_utf8_cstr(id16, id, status); + if (rules) icu_utf16_from_utf8_cstr(rules16, rules, status); @@ -69,10 +70,10 @@ struct icu_transform * icu_transform_create(const char *id, char action, case 'f': case 'F': transform->trans - = utrans_openU(id16->utf16, + = utrans_openU(id16->utf16, id16->utf16_len, UTRANS_FORWARD, - rules16->utf16, + rules16->utf16, rules16->utf16_len, &transform->parse_error, status); break; @@ -82,7 +83,7 @@ struct icu_transform * icu_transform_create(const char *id, char action, = utrans_openU(id16->utf16, id16->utf16_len, UTRANS_REVERSE , - rules16->utf16, + rules16->utf16, rules16->utf16_len, &transform->parse_error, status); break; @@ -92,7 +93,7 @@ struct icu_transform * icu_transform_create(const char *id, char action, } icu_buf_utf16_destroy(rules16); icu_buf_utf16_destroy(id16); - + if (U_SUCCESS(*status)) return transform; @@ -116,7 +117,7 @@ int icu_transform_trans(struct icu_transform * transform, const struct icu_buf_utf16 * src16, UErrorCode *status) { - if (!transform || !transform->trans + if (!transform || !transform->trans || !src16 || !dest16) return 0; @@ -129,14 +130,14 @@ int icu_transform_trans(struct icu_transform * transform, if (!icu_buf_utf16_copy(dest16, src16)) return 0; - utrans_transUChars (transform->trans, - dest16->utf16, &(dest16->utf16_len), - dest16->utf16_cap, - 0, &(dest16->utf16_len), status); + utrans_transUChars(transform->trans, + dest16->utf16, &(dest16->utf16_len), + dest16->utf16_cap, + 0, &(dest16->utf16_len), status); if (U_FAILURE(*status)) icu_buf_utf16_clear(dest16); - + return dest16->utf16_len; }