X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ficu_I18N.c;h=de8487418822a4420c99ea9f17044d4f77577c58;hb=765b94caaa93566a9792019ec5d2bf56fc8100a3;hp=5e32d6b1f89cd7fd7dda617c7637eac1823f65a9;hpb=11bae153f20df554744a8b96592616eca05cc522;p=yaz-moved-to-github.git

diff --git a/src/icu_I18N.c b/src/icu_I18N.c
index 5e32d6b..de84874 100644
--- a/src/icu_I18N.c
+++ b/src/icu_I18N.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: icu_I18N.c,v 1.19 2007-11-08 18:02:04 adam Exp $
+ * $Id: icu_I18N.c,v 1.21 2007-11-30 11:43:47 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -465,10 +465,10 @@ int icu_utf16_casemap(struct icu_buf_utf16 * dest16,
 
 
 
-UErrorCode icu_sortkey8_from_utf16(UCollator *coll,
-                                   struct icu_buf_utf8 * dest8, 
-                                   struct icu_buf_utf16 * src16,
-                                   UErrorCode * status)
+void icu_sortkey8_from_utf16(UCollator *coll,
+                             struct icu_buf_utf8 * dest8, 
+                             struct icu_buf_utf16 * src16,
+                             UErrorCode * status)
 { 
   
     int32_t sortkey_len = 0;
@@ -488,8 +488,6 @@ UErrorCode icu_sortkey8_from_utf16(UCollator *coll,
         dest8->utf8_len = sortkey_len;
     else 
         icu_buf_utf8_clear(dest8);
-    
-    return sortkey_len;
 }
 
 
@@ -922,7 +920,7 @@ struct icu_chain * icu_chain_xml_config(const xmlNode *xml_node,
         if (!strcmp((const char *) node->name, "casemap"))
             step = icu_chain_insert_step(chain, ICU_chain_step_type_casemap, 
                                          (const uint8_t *) xml_rule, status);
-        else if (!strcmp((const char *) node->name, "normalize"))
+        else if (!strcmp((const char *) node->name, "transform"))
             step = icu_chain_insert_step(chain, ICU_chain_step_type_normalize, 
                                          (const uint8_t *) xml_rule, status);
         else if (!strcmp((const char *) node->name, "tokenize"))