projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
For ICU, set ICU status to OK for some public functions.
[yaz-moved-to-github.git]
/
src
/
icu_I18N.c
diff --git
a/src/icu_I18N.c
b/src/icu_I18N.c
index
932c1b2
..
a978b21
100644
(file)
--- 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.
*
* 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.12 2007-11-07 10:19:12 adam Exp $
*/
#if HAVE_CONFIG_H
*/
#if HAVE_CONFIG_H
@@
-267,6
+267,7
@@
UErrorCode icu_utf16_from_utf8_cstr(struct icu_buf_utf16 * dest16,
size_t src8cstr_len = 0;
int32_t utf16_len = 0;
size_t src8cstr_len = 0;
int32_t utf16_len = 0;
+ *status = U_ZERO_ERROR;
src8cstr_len = strlen(src8cstr);
u_strFromUTF8(dest16->utf16, dest16->utf16_cap,
src8cstr_len = strlen(src8cstr);
u_strFromUTF8(dest16->utf16, dest16->utf16_cap,
@@
-850,7
+851,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)
{
int sort,
UErrorCode * status)
{
@@
-858,6
+859,8
@@
struct icu_chain * icu_chain_create(const uint8_t * locale,
struct icu_chain * chain
= (struct icu_chain *) malloc(sizeof(struct icu_chain));
struct icu_chain * chain
= (struct icu_chain *) malloc(sizeof(struct icu_chain));
+ *status = U_ZERO_ERROR;
+
strncpy((char *) chain->locale, (const char *) locale, 16);
chain->locale[16 - 1] = '\0';
strncpy((char *) chain->locale, (const char *) locale, 16);
chain->locale[16 - 1] = '\0';
@@
-905,14
+908,16
@@
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){
xmlNode *node = 0;
struct icu_chain * chain = 0;
int sort,
UErrorCode * status){
xmlNode *node = 0;
struct icu_chain * chain = 0;
+ *status = U_ZERO_ERROR;
+
if (!xml_node
||xml_node->type != XML_ELEMENT_NODE
// || strcmp((const char *) xml_node->name, "icu_chain")
if (!xml_node
||xml_node->type != XML_ELEMENT_NODE
// || strcmp((const char *) xml_node->name, "icu_chain")
@@
-1151,6
+1156,8
@@
int icu_chain_next_token(struct icu_chain * chain,
{
int got_token = 0;
{
int got_token = 0;
+ *status = U_ZERO_ERROR;
+
if (!chain)
return 0;
if (!chain)
return 0;