From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 6 Nov 2007 10:27:30 +0000 (+0000)
Subject: For ICU, locale, is a char ptr rather than uint8_t ptr.
X-Git-Tag: YAZ.3.0.16~33
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=71509ab1affd957fa0af7c7536105988a7ccd93d;p=yaz-moved-to-github.git

For ICU, locale, is a char ptr rather than uint8_t ptr.

The type uint8_t is a ICU type that we don't want to use if we
can avoid it.
---

diff --git a/include/yaz/icu_I18N.h b/include/yaz/icu_I18N.h
index c2c5042..0e43725 100644
--- a/include/yaz/icu_I18N.h
+++ b/include/yaz/icu_I18N.h
@@ -244,14 +244,14 @@ struct icu_chain
     struct icu_chain_step * steps;
 };
 
-struct icu_chain * icu_chain_create(const uint8_t * locale,
+struct icu_chain * icu_chain_create(const char * locale,
                                     int sort,
                                     UErrorCode * status);
 
 void icu_chain_destroy(struct icu_chain * chain);
 
-struct icu_chain * icu_chain_xml_config(xmlNode *xml_node,
-                                        const uint8_t * locale,
+struct icu_chain * icu_chain_xml_config(const xmlNode *xml_node,
+                                        const char *locale,
                                         int sort,
                                         UErrorCode * status);
 
diff --git a/src/icu_I18N.c b/src/icu_I18N.c
index 932c1b2..1f30990 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.10 2007-10-29 13:50:57 marc Exp $
+ * $Id: icu_I18N.c,v 1.11 2007-11-06 10:27:30 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -850,7 +850,7 @@ void icu_chain_step_destroy(struct icu_chain_step * step){
 
 
 
-struct icu_chain * icu_chain_create(const uint8_t * locale, 
+struct icu_chain * icu_chain_create(const char *locale, 
                                     int sort,
                                     UErrorCode * status)
 {
@@ -905,8 +905,8 @@ void icu_chain_destroy(struct icu_chain * chain)
 
 
 
-struct icu_chain * icu_chain_xml_config(xmlNode *xml_node, 
-                                        const uint8_t * locale, 
+struct icu_chain * icu_chain_xml_config(const xmlNode *xml_node, 
+                                        const char *locale, 
                                         int sort,
                                         UErrorCode * status){
 
diff --git a/util/yaz-icu.c b/util/yaz-icu.c
index d2ef11f..ff249e0 100644
--- a/util/yaz-icu.c
+++ b/util/yaz-icu.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: yaz-icu.c,v 1.6 2007-10-29 10:22:23 marc Exp $
+ * $Id: yaz-icu.c,v 1.7 2007-11-06 10:27:30 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -443,7 +443,7 @@ static void process_text_file(const struct config_t *p_config)
     if (!xml_locale || !strlen((const char *) xml_locale))
         return;        
     
-    config.chain = icu_chain_xml_config(xml_node, (uint8_t *) xml_locale, 0,
+    config.chain = icu_chain_xml_config(xml_node, (const char *) xml_locale, 0,
                                         &status);
 
     xmlFree(xml_locale);