X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Ficu_transform.c;h=8e68ba9ab39f2457af86458d9af93a52426641cc;hp=e8d20129b92addaa0989689cd57e0cfd7512b136;hb=7bfb3050edda3cfa84906284a329e3f7fb017e24;hpb=79f064dd58f7d27cd29e429566f302bb18d87b9e diff --git a/src/icu_transform.c b/src/icu_transform.c index e8d2012..8e68ba9 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-2011 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ @@ -30,7 +30,7 @@ struct icu_transform { char action; UParseError parse_error; - UTransliterator * trans; + UTransliterator *trans; }; struct icu_transform *icu_transform_clone(struct icu_transform *old) @@ -46,9 +46,9 @@ struct icu_transform *icu_transform_clone(struct icu_transform *old) return transform; } -struct icu_transform * icu_transform_create(const char *id, char action, - const char *rules, - UErrorCode *status) +struct icu_transform *icu_transform_create(const char *id, char action, + const char *rules, + UErrorCode *status) { struct icu_buf_utf16 *id16 = icu_buf_utf16_create(0); struct icu_buf_utf16 *rules16 = icu_buf_utf16_create(0); @@ -70,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; @@ -83,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; @@ -93,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; @@ -102,7 +102,7 @@ struct icu_transform * icu_transform_create(const char *id, char action, return 0; } -void icu_transform_destroy(struct icu_transform * transform) +void icu_transform_destroy(struct icu_transform *transform) { if (transform) { @@ -112,12 +112,12 @@ void icu_transform_destroy(struct icu_transform * transform) } } -int icu_transform_trans(struct icu_transform * transform, - struct icu_buf_utf16 * dest16, - const struct icu_buf_utf16 * src16, +int icu_transform_trans(struct icu_transform *transform, + struct icu_buf_utf16 *dest16, + const struct icu_buf_utf16 *src16, UErrorCode *status) { - if (!transform || !transform->trans + if (!transform || !transform->trans || !src16 || !dest16) return 0; @@ -130,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; }