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
Reformatting
[yaz-moved-to-github.git]
/
util
/
yaz-icu.c
diff --git
a/util/yaz-icu.c
b/util/yaz-icu.c
index
56e2bf4
..
3ed2446
100644
(file)
--- a/
util/yaz-icu.c
+++ b/
util/yaz-icu.c
@@
-1,8
+1,6
@@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: yaz-icu.c,v 1.15 2007-11-15 08:45:52 adam Exp $
*/
#if HAVE_CONFIG_H
*/
#if HAVE_CONFIG_H
@@
-157,7
+155,7
@@
static void print_icu_converters(const struct config_t *p_config)
static void print_icu_transliterators(const struct config_t *p_config)
{
int32_t buf_cap = 128;
static void print_icu_transliterators(const struct config_t *p_config)
{
int32_t buf_cap = 128;
- char buf[buf_cap];
+ char buf[128];
int32_t i;
int32_t count = utrans_countAvailableIDs();
int32_t i;
int32_t count = utrans_countAvailableIDs();
@@
-395,7
+393,7
@@
static void print_icu_xml_locales(const struct config_t *p_config)
if(U_FAILURE(status))
{
fprintf(stderr, "ICU Error: %d %s\n", status, u_errorName(status));
if(U_FAILURE(status))
{
fprintf(stderr, "ICU Error: %d %s\n", status, u_errorName(status));
- exit(status);
+ exit(2);
}
}
}
}
@@
-440,11
+438,11
@@
static void process_text_file(const struct config_t *p_config)
UErrorCode status = U_ZERO_ERROR;
int success = 0;
UErrorCode status = U_ZERO_ERROR;
int success = 0;
- if (! xml_node)
+ if (!xml_node)
{
printf("Could not parse XML config file '%s' \n",
config.conffile);
{
printf("Could not parse XML config file '%s' \n",
config.conffile);
- exit (1);
+ exit(1);
}
config.chain = icu_chain_xml_config(xml_node, 1, &status);
}
config.chain = icu_chain_xml_config(xml_node, 1, &status);
@@
-454,7
+452,7
@@
static void process_text_file(const struct config_t *p_config)
else {
printf("Could not set up ICU chain from config file '%s' \n",
config.conffile);
else {
printf("Could not set up ICU chain from config file '%s' \n",
config.conffile);
- exit (1);
+ exit(1);
}
if (p_config->xmloutput)
}
if (p_config->xmloutput)
@@
-483,7
+481,7
@@
static void process_text_file(const struct config_t *p_config)
{
/* should XML encode this. Bug #1902 */
fprintf(config.outfile,
{
/* should XML encode this. Bug #1902 */
fprintf(config.outfile,
- "<token id=\%lu\" line=\"%lu\""
+ "<token id=\"%lu\" line=\"%lu\""
" norm=\"%s\" display=\"%s\" sortkey=\"%s\"/>\n",
token_count,
line_count,
" norm=\"%s\" display=\"%s\" sortkey=\"%s\"/>\n",
token_count,
line_count,
@@
-538,9
+536,10
@@
int main(int argc, char **argv)
"re-configure and re-compile\n");
"re-configure and re-compile\n");
+ exit(3);
#endif /* YAZ_HAVE_ICU */
#endif /* YAZ_HAVE_ICU */
- return(0);
+ return 0;
}
}