ANSI funcs with no args

[pazpar2-moved-to-github.git] / src / charsets.c

diff --git a/src/charsets.c b/src/charsets.c
index 80388e8..f722416 100644 (file)
--- a/src/charsets.c
+++ b/src/charsets.c
@@ -70,9 +70,12 @@ pp2_charset_t pp2_charset_create_xml(xmlNode *xml_node)
 {
 #ifdef HAVE_ICU
     UErrorCode status = U_ZERO_ERROR;
+    struct icu_chain *chain = 0;
+    if (xml_node)
+        xml_node = xml_node->children;
     while (xml_node && xml_node->type != XML_ELEMENT_NODE)
         xml_node = xml_node->next;
-    struct icu_chain *chain = icu_chain_xml_config(xml_node, &status);
+    chain = icu_chain_xml_config(xml_node, &status);
     if (!chain || U_FAILURE(status)){
         //xmlDocPtr icu_doc = 0;
         //xmlChar *xmlstr = 0;
@@ -139,8 +142,8 @@ pp2_relevance_token_t pp2_relevance_tokenize(pp2_charset_t pct,
 #ifdef HAVE_ICU
     if (pct->icu_chn)
     {
-        pct->icu_sts = U_ZERO_ERROR;
         int ok = 0;
+        pct->icu_sts = U_ZERO_ERROR;
         ok = icu_chain_assign_cstr(pct->icu_chn, buf, &pct->icu_sts);
         //printf("\nfield ok: %d '%s'\n", ok, buf);
         prt->pct = pct;
@@ -181,7 +184,7 @@ static const char *pp2_relevance_token_a_to_z(pp2_relevance_token_t prt)
     int c;
 
     /* skip white space */
-    while (*cp && (c = raw_char(tolower(*cp))) < 0)
+    while (*cp && (c = raw_char(tolower(*(const unsigned char *)cp))) < 0)
         cp++;
     if (*cp == '\0')
     {