Skip to content
Snippets Groups Projects
Commit baece50b8f39 authored by Nick Wellnhofer's avatar Nick Wellnhofer
Browse files

Fix compiler warnings in examples/xsltICUSort.c

parent ce1e932f70ab
Branches
No related tags found
No related merge requests found
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
xsltTransformError(ctxt, NULL, NULL, "xsltICUSortFunction: Error opening converter\n"); xsltTransformError(ctxt, NULL, NULL, "xsltICUSortFunction: Error opening converter\n");
} }
if(comp->has_lang) 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) { if(U_FAILURE(status) || !comp->has_lang) {
status = U_ZERO_ERROR; status = U_ZERO_ERROR;
coll = ucol_open("en", &status); coll = ucol_open("en", &status);
...@@ -179,8 +179,12 @@ ...@@ -179,8 +179,12 @@
target2len = xmlStrlen(results[j + incr]->stringval) * 2; target2len = xmlStrlen(results[j + incr]->stringval) * 2;
target = xmlMalloc(targetlen * sizeof(UChar)); target = xmlMalloc(targetlen * sizeof(UChar));
target2 = xmlMalloc(target2len * sizeof(UChar)); target2 = xmlMalloc(target2len * sizeof(UChar));
targetlen = ucnv_toUChars(conv, target, targetlen, results[j]->stringval, -1, &status); targetlen = ucnv_toUChars(conv, target, targetlen,
target2len = ucnv_toUChars(conv, target2, target2len, results[j+incr]->stringval, -1, &status); (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)); tst = ucol_strcoll(coll, target, u_strlen(target), target2, u_strlen(target2));
/* End ICU change */ /* End ICU change */
} }
...@@ -227,8 +231,12 @@ ...@@ -227,8 +231,12 @@
target2len = xmlStrlen(res[j + incr]->stringval) * 2; target2len = xmlStrlen(res[j + incr]->stringval) * 2;
target = xmlMalloc(targetlen * sizeof(UChar)); target = xmlMalloc(targetlen * sizeof(UChar));
target2 = xmlMalloc(target2len * sizeof(UChar)); target2 = xmlMalloc(target2len * sizeof(UChar));
targetlen = ucnv_toUChars(conv, target, targetlen, res[j]->stringval, -1, &status); targetlen = ucnv_toUChars(conv, target, targetlen,
target2len = ucnv_toUChars(conv, target2, target2len, res[j+incr]->stringval, -1, &status); (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)); tst = ucol_strcoll(coll, target, u_strlen(target), target2, u_strlen(target2));
/* End ICU change */ /* End ICU change */
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment