From ef14b02cb0ee8cf7a037100c555aa19e8fce1e29 Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer Date: Tue, 18 Oct 2022 02:44:55 +0200 Subject: [PATCH] Fix compiler warnings in examples/xsltICUSort.c --- examples/xsltICUSort.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/examples/xsltICUSort.c b/examples/xsltICUSort.c index 0053122a..af1410ba 100644 --- a/examples/xsltICUSort.c +++ b/examples/xsltICUSort.c @@ -136,7 +136,7 @@ xsltICUSortFunction(xsltTransformContextPtr ctxt, xmlNodePtr *sorts, xsltTransformError(ctxt, NULL, NULL, "xsltICUSortFunction: Error opening converter\n"); } if(comp->has_lang) - coll = ucol_open(comp->lang, &status); + coll = ucol_open((const char *) comp->lang, &status); if(U_FAILURE(status) || !comp->has_lang) { status = U_ZERO_ERROR; coll = ucol_open("en", &status); @@ -179,8 +179,12 @@ xsltICUSortFunction(xsltTransformContextPtr ctxt, xmlNodePtr *sorts, target2len = xmlStrlen(results[j + incr]->stringval) * 2; target = xmlMalloc(targetlen * sizeof(UChar)); target2 = xmlMalloc(target2len * sizeof(UChar)); - targetlen = ucnv_toUChars(conv, target, targetlen, results[j]->stringval, -1, &status); - target2len = ucnv_toUChars(conv, target2, target2len, results[j+incr]->stringval, -1, &status); + targetlen = ucnv_toUChars(conv, target, targetlen, + (const char *) results[j]->stringval, + -1, &status); + target2len = ucnv_toUChars(conv, target2, target2len, + (const char *) results[j+incr]->stringval, + -1, &status); tst = ucol_strcoll(coll, target, u_strlen(target), target2, u_strlen(target2)); /* End ICU change */ } @@ -227,8 +231,12 @@ xsltICUSortFunction(xsltTransformContextPtr ctxt, xmlNodePtr *sorts, target2len = xmlStrlen(res[j + incr]->stringval) * 2; target = xmlMalloc(targetlen * sizeof(UChar)); target2 = xmlMalloc(target2len * sizeof(UChar)); - targetlen = ucnv_toUChars(conv, target, targetlen, res[j]->stringval, -1, &status); - target2len = ucnv_toUChars(conv, target2, target2len, res[j+incr]->stringval, -1, &status); + targetlen = ucnv_toUChars(conv, target, targetlen, + (const char *) res[j]->stringval, + -1, &status); + target2len = ucnv_toUChars(conv, target2, target2len, + (const char *) res[j+incr]->stringval, + -1, &status); tst = ucol_strcoll(coll, target, u_strlen(target), target2, u_strlen(target2)); /* End ICU change */ }