yaz-icu.c refactor and cleanup

Use config parameter consistently. Call u_cleanup during exit to
better cheak for leaks in ICU usage.

diff --git a/util/yaz-icu.c b/util/yaz-icu.c
index fe86bed..27180b9 100644 (file)
--- a/util/yaz-icu.c
+++ b/util/yaz-icu.c
@@ -22,12 +22,13 @@
 #include <unicode/ucol.h> 
 #include <unicode/ubrk.h>
 #include <unicode/utrans.h>
 #include <unicode/ucol.h> 
 #include <unicode/ubrk.h>
 #include <unicode/utrans.h>

+#include <unicode/uclean.h>

 
 #include <yaz/icu.h>
 #include <yaz/wrbuf.h>
 
 /* commando line and config parameters */
 
 #include <yaz/icu.h>
 #include <yaz/wrbuf.h>
 
 /* commando line and config parameters */

-static struct config_t { 
+struct config_t { 

     char conffile[1024];
     char print[1024];
     int xmloutput;
     char conffile[1024];
     char print[1024];
     int xmloutput;

@@ -35,9 +36,7 @@ static struct config_t {
     yaz_icu_chain_t chain;
     FILE * infile;
     FILE * outfile;
     yaz_icu_chain_t chain;
     FILE * infile;
     FILE * outfile;

-} config;
-
-
+};

   
 void print_option_error(const struct config_t *p_config)
 {  
   
 void print_option_error(const struct config_t *p_config)
 {  

@@ -150,28 +149,28 @@ static void print_icu_converters(const struct config_t *p_config)
 
     count = ucnv_countAvailable();
     if (p_config->xmloutput)
 
     count = ucnv_countAvailable();
     if (p_config->xmloutput)

-        fprintf(config.outfile, "<converters count=\"%d\" default=\"%s\">\n",
+        fprintf(p_config->outfile, "<converters count=\"%d\" default=\"%s\">\n",

                 count, ucnv_getDefaultName());
     else
     {    
                 count, ucnv_getDefaultName());
     else
     {    

-        fprintf(config.outfile, "Available ICU converters: %d\n", count);
-        fprintf(config.outfile, "Default ICU Converter is: '%s'\n", 
+        fprintf(p_config->outfile, "Available ICU converters: %d\n", count);
+        fprintf(p_config->outfile, "Default ICU Converter is: '%s'\n", 

                 ucnv_getDefaultName());
     }
     
     for (i = 0; i < count; i++)
     {
         if (p_config->xmloutput)
                 ucnv_getDefaultName());
     }
     
     for (i = 0; i < count; i++)
     {
         if (p_config->xmloutput)

-            fprintf(config.outfile, "<converter id=\"%s\"/>\n", 
+            fprintf(p_config->outfile, "<converter id=\"%s\"/>\n", 

                     ucnv_getAvailableName(i));
         else     
                     ucnv_getAvailableName(i));
         else     

-            fprintf(config.outfile, "%s\n", ucnv_getAvailableName(i));
+            fprintf(p_config->outfile, "%s\n", ucnv_getAvailableName(i));

     }
     
     if (p_config->xmloutput)
     }
     
     if (p_config->xmloutput)

-        fprintf(config.outfile, "</converters>\n");
+        fprintf(p_config->outfile, "</converters>\n");

     else
     else

-        fprintf(config.outfile, "\n");
+        fprintf(p_config->outfile, "\n");

 }
 
 static void print_icu_transliterators(const struct config_t *p_config)
 }
 
 static void print_icu_transliterators(const struct config_t *p_config)

@@ -183,23 +182,23 @@ static void print_icu_transliterators(const struct config_t *p_config)
     int32_t length;
 
     if (p_config->xmloutput)
     int32_t length;
 
     if (p_config->xmloutput)

-        fprintf(config.outfile, "<transliterators count=\"%d\">\n",  count);
+        fprintf(p_config->outfile, "<transliterators count=\"%d\">\n",  count);

     else 
     else 

-        fprintf(config.outfile, "Available ICU transliterators: %d\n", count);
+        fprintf(p_config->outfile, "Available ICU transliterators: %d\n", count);

 
     while ((name = uenum_next(en, &length, &status)))
     {
         if (p_config->xmloutput)
 
     while ((name = uenum_next(en, &length, &status)))
     {
         if (p_config->xmloutput)

-            fprintf(config.outfile, "<transliterator id=\"%s\"/>\n", name);
+            fprintf(p_config->outfile, "<transliterator id=\"%s\"/>\n", name);

         else
         else

-            fprintf(config.outfile, "%s\n", name);
+            fprintf(p_config->outfile, "%s\n", name);

     }
     uenum_close(en);
     if (p_config->xmloutput)
     }
     uenum_close(en);
     if (p_config->xmloutput)

-        fprintf(config.outfile, "</transliterators>\n");
+        fprintf(p_config->outfile, "</transliterators>\n");

     else
     {
     else
     {

-        fprintf(config.outfile, "\n\nUnicode Set Patterns:\n"
+        fprintf(p_config->outfile, "\n\nUnicode Set Patterns:\n"

                 "   Pattern         Description\n"
                 "   Ranges          [a-z]      The lower case letters a through z\n"
                 "   Named Chars     [abc123] The six characters a,b,c,1,2 and 3\n"
                 "   Pattern         Description\n"
                 "   Ranges          [a-z]      The lower case letters a through z\n"
                 "   Named Chars     [abc123] The six characters a,b,c,1,2 and 3\n"

@@ -241,7 +240,7 @@ static void print_icu_transliterators(const struct config_t *p_config)
             );
         
         
             );
         
         

-        fprintf(config.outfile, "\n\n");
+        fprintf(p_config->outfile, "\n\n");

         
     }
 }
         
     }
 }

@@ -291,13 +290,13 @@ static void print_icu_xml_locales(const struct config_t *p_config)
 
     if (p_config->xmloutput)
     {
 
     if (p_config->xmloutput)
     {

-        fprintf(config.outfile, "<locales count=\"%d\" default=\"%s\" collations=\"%d\">\n", 
+        fprintf(p_config->outfile, "<locales count=\"%d\" default=\"%s\" collations=\"%d\">\n", 

                 count, uloc_getDefault(), ucol_countAvailable());
     }
     else
     {
                 count, uloc_getDefault(), ucol_countAvailable());
     }
     else
     {

-        fprintf(config.outfile, "Available ICU locales: %d\n", count);
-        fprintf(config.outfile, "Default locale is: %s\n",  uloc_getDefault());
+        fprintf(p_config->outfile, "Available ICU locales: %d\n", count);
+        fprintf(p_config->outfile, "Default locale is: %s\n",  uloc_getDefault());

     }
   
     for (i = 0; i < count; i++) 
     }
   
     for (i = 0; i < count; i++) 

@@ -371,47 +370,47 @@ static void print_icu_xml_locales(const struct config_t *p_config)
 
         if (p_config->xmloutput)
         {
 
         if (p_config->xmloutput)
         {

-            fprintf(config.outfile, "<locale id=\"%s\"", uloc_getAvailable(i)); 
-            /* fprintf(config.outfile, " locale=\"%s\"", uloc_getAvailable(i)); */
+            fprintf(p_config->outfile, "<locale id=\"%s\"", uloc_getAvailable(i)); 
+            /* fprintf(p_config->outfile, " locale=\"%s\"", uloc_getAvailable(i)); */

             /* if (strlen(keyword_str)) */
             /* if (strlen(keyword_str)) */

-            /*   fprintf(config.outfile, " keyword=\"%s\"", keyword_str); */
+            /*   fprintf(p_config->outfile, " keyword=\"%s\"", keyword_str); */

             /* if (ucol_getAvailable(i)) */
             /* if (ucol_getAvailable(i)) */

-            /*   fprintf(config.outfile, " collation=\"1\""); */
+            /*   fprintf(p_config->outfile, " collation=\"1\""); */

             if (strlen(lang_str))
             if (strlen(lang_str))

-                fprintf(config.outfile, " language=\"%s\"", lang_str);
+                fprintf(p_config->outfile, " language=\"%s\"", lang_str);

             if (strlen(script_str))
             if (strlen(script_str))

-                fprintf(config.outfile, " script=\"%s\"", script_str);
+                fprintf(p_config->outfile, " script=\"%s\"", script_str);

             if (strlen(location_str))
             if (strlen(location_str))

-                fprintf(config.outfile, " location=\"%s\"", location_str);
+                fprintf(p_config->outfile, " location=\"%s\"", location_str);

             if (strlen(variant_str))
             if (strlen(variant_str))

-                fprintf(config.outfile, " variant=\"%s\"", variant_str);
+                fprintf(p_config->outfile, " variant=\"%s\"", variant_str);

             if (strlen(name_str))
             if (strlen(name_str))

-                fprintf(config.outfile, " name=\"%s\"", name_str);
+                fprintf(p_config->outfile, " name=\"%s\"", name_str);

             if (strlen(localname_str))
             if (strlen(localname_str))

-                fprintf(config.outfile, " localname=\"%s\"", localname_str);
-            fprintf(config.outfile, ">");
+                fprintf(p_config->outfile, " localname=\"%s\"", localname_str);
+            fprintf(p_config->outfile, ">");

             if (strlen(localname_str))
             if (strlen(localname_str))

-                fprintf(config.outfile, "%s", localname_str);
-            fprintf(config.outfile, "</locale>\n"); 
+                fprintf(p_config->outfile, "%s", localname_str);
+            fprintf(p_config->outfile, "</locale>\n"); 

         }
         else if (1 == p_config->xmloutput)
         {
         }
         else if (1 == p_config->xmloutput)
         {

-            fprintf(config.outfile, "%s", uloc_getAvailable(i)); 
-            fprintf(config.outfile, " | ");
+            fprintf(p_config->outfile, "%s", uloc_getAvailable(i)); 
+            fprintf(p_config->outfile, " | ");

             if (strlen(name_str))
             if (strlen(name_str))

-                fprintf(config.outfile, "%s", name_str);
-            fprintf(config.outfile, " | ");
+                fprintf(p_config->outfile, "%s", name_str);
+            fprintf(p_config->outfile, " | ");

             if (strlen(localname_str))
             if (strlen(localname_str))

-                fprintf(config.outfile, "%s", localname_str);
-            fprintf(config.outfile, "\n");
+                fprintf(p_config->outfile, "%s", localname_str);
+            fprintf(p_config->outfile, "\n");

         }
         else
         }
         else

-            fprintf(config.outfile, "%s\n", uloc_getAvailable(i));
+            fprintf(p_config->outfile, "%s\n", uloc_getAvailable(i));

     }
     if (p_config->xmloutput)
     }
     if (p_config->xmloutput)

-        fprintf(config.outfile, "</locales>\n");
+        fprintf(p_config->outfile, "</locales>\n");

     else
     else

-        fprintf(config.outfile, "\n");
+        fprintf(p_config->outfile, "\n");

 
     if (U_FAILURE(status))
     {
 
     if (U_FAILURE(status))
     {

@@ -424,35 +423,35 @@ static void print_icu_xml_locales(const struct config_t *p_config)
 static void print_info(const struct config_t *p_config)
 {
     if (p_config->xmloutput)
 static void print_info(const struct config_t *p_config)
 {
     if (p_config->xmloutput)

-        fprintf(config.outfile, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+        fprintf(p_config->outfile, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"

                 "<icu>\n");
 
                 "<icu>\n");
 

-    if ('c' == config.print[0])
-        print_icu_converters(&config);
-    else if ('l' == config.print[0])
-        print_icu_xml_locales(&config);
-    else if ('t' == config.print[0])
-        print_icu_transliterators(&config);
+    if ('c' == p_config->print[0])
+        print_icu_converters(p_config);
+    else if ('l' == p_config->print[0])
+        print_icu_xml_locales(p_config);
+    else if ('t' == p_config->print[0])
+        print_icu_transliterators(p_config);

     else {
     else {

-        print_icu_converters(&config);
-        print_icu_xml_locales(&config);
-        print_icu_transliterators(&config);
+        print_icu_converters(p_config);
+        print_icu_xml_locales(p_config);
+        print_icu_transliterators(p_config);

     }
 
     if (p_config->xmloutput)
     }
 
     if (p_config->xmloutput)

-        fprintf(config.outfile, "</icu>\n");
+        fprintf(p_config->outfile, "</icu>\n");

 
     exit(0);
 }
 
 
 
 
     exit(0);
 }
 
 
 

-static void process_text_file(const struct config_t *p_config)
+static void process_text_file(struct config_t *p_config)

 {
     char *line = 0;
     char linebuf[1024];
  
 {
     char *line = 0;
     char linebuf[1024];
  

-    xmlDoc *doc = xmlParseFile(config.conffile);  
+    xmlDoc *doc = xmlParseFile(p_config->conffile);  

     xmlNode *xml_node = xmlDocGetRootElement(doc);
 
     long unsigned int token_count = 0;    
     xmlNode *xml_node = xmlDocGetRootElement(doc);
 
     long unsigned int token_count = 0;    

@@ -463,82 +462,82 @@ static void process_text_file(const struct config_t *p_config)
     if (!xml_node)
     {   
         printf("Could not parse XML config file '%s' \n",
     if (!xml_node)
     {   
         printf("Could not parse XML config file '%s' \n",

-                config.conffile);
+                p_config->conffile);

         exit(1);
     }
 
         exit(1);
     }
 

-    config.chain = icu_chain_xml_config(xml_node, 1, &status);
+    p_config->chain = icu_chain_xml_config(xml_node, 1, &status);

 
 

-    if (!config.chain || !U_SUCCESS(status))
+    if (!p_config->chain || !U_SUCCESS(status))

     {   
         printf("Could not set up ICU chain from config file '%s' \n",
     {   
         printf("Could not set up ICU chain from config file '%s' \n",

-                config.conffile);
+                p_config->conffile);

         if (!U_SUCCESS(status))
             printf("ICU Error: %d %s\n", status, u_errorName(status));
         exit(1);
     }
 
     if (p_config->xmloutput)
         if (!U_SUCCESS(status))
             printf("ICU Error: %d %s\n", status, u_errorName(status));
         exit(1);
     }
 
     if (p_config->xmloutput)

-        fprintf(config.outfile,
+        fprintf(p_config->outfile,

                 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
                 "<icu>\n"
                 "<tokens>\n");
     
     /* read input lines for processing */
                 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
                 "<icu>\n"
                 "<tokens>\n");
     
     /* read input lines for processing */

-    while ((line=fgets(linebuf, sizeof(linebuf)-1, config.infile)))
+    while ((line=fgets(linebuf, sizeof(linebuf)-1, p_config->infile)))

     {
         WRBUF sw = wrbuf_alloc();
         WRBUF cdata = wrbuf_alloc();
     {
         WRBUF sw = wrbuf_alloc();
         WRBUF cdata = wrbuf_alloc();

-        int success = icu_chain_assign_cstr(config.chain, line, &status);
+        int success = icu_chain_assign_cstr(p_config->chain, line, &status);

         line_count++;
 
         line_count++;
 

-        while (success && icu_chain_next_token(config.chain, &status))
+        while (success && icu_chain_next_token(p_config->chain, &status))

         {
             if (U_FAILURE(status))
                 success = 0;
             else
             {
         {
             if (U_FAILURE(status))
                 success = 0;
             else
             {

-                const char *sortkey = icu_chain_token_sortkey(config.chain);
+                const char *sortkey = icu_chain_token_sortkey(p_config->chain);

                 wrbuf_rewind(sw);
                 wrbuf_puts_escaped(sw, sortkey);
                 token_count++;
                 if (p_config->xmloutput)                    
                 {
                 wrbuf_rewind(sw);
                 wrbuf_puts_escaped(sw, sortkey);
                 token_count++;
                 if (p_config->xmloutput)                    
                 {

-                    fprintf(config.outfile, 
+                    fprintf(p_config->outfile, 

                             "<token id=\"%lu\" line=\"%lu\"",
                             token_count, line_count);
 
                     wrbuf_rewind(cdata);
                             "<token id=\"%lu\" line=\"%lu\"",
                             token_count, line_count);
 
                     wrbuf_rewind(cdata);

-                    wrbuf_xmlputs(cdata, icu_chain_token_norm(config.chain));
-                    fprintf(config.outfile, " norm=\"%s\"",
+                    wrbuf_xmlputs(cdata, icu_chain_token_norm(p_config->chain));
+                    fprintf(p_config->outfile, " norm=\"%s\"",

                             wrbuf_cstr(cdata));
 
                     wrbuf_rewind(cdata);
                             wrbuf_cstr(cdata));
 
                     wrbuf_rewind(cdata);

-                    wrbuf_xmlputs(cdata, icu_chain_token_display(config.chain));
-                    fprintf(config.outfile, " display=\"%s\"",
+                    wrbuf_xmlputs(cdata, icu_chain_token_display(p_config->chain));
+                    fprintf(p_config->outfile, " display=\"%s\"",

                             wrbuf_cstr(cdata));
                     
                     if (p_config->sortoutput)
                     {
                         wrbuf_rewind(cdata);
                         wrbuf_xmlputs(cdata, wrbuf_cstr(sw));
                             wrbuf_cstr(cdata));
                     
                     if (p_config->sortoutput)
                     {
                         wrbuf_rewind(cdata);
                         wrbuf_xmlputs(cdata, wrbuf_cstr(sw));

-                        fprintf(config.outfile, " sortkey=\"%s\"",
+                        fprintf(p_config->outfile, " sortkey=\"%s\"",

                                 wrbuf_cstr(cdata));
                     }
                                 wrbuf_cstr(cdata));
                     }

-                    fprintf(config.outfile, "/>\n");
+                    fprintf(p_config->outfile, "/>\n");

                 }
                 else
                 {
                 }
                 else
                 {

-                    fprintf(config.outfile, "%lu %lu '%s' '%s'",
+                    fprintf(p_config->outfile, "%lu %lu '%s' '%s'",

                             token_count,
                             line_count,
                             token_count,
                             line_count,

-                            icu_chain_token_norm(config.chain),
-                            icu_chain_token_display(config.chain));
+                            icu_chain_token_norm(p_config->chain),
+                            icu_chain_token_display(p_config->chain));

                     if (p_config->sortoutput)
                     {
                     if (p_config->sortoutput)
                     {

-                        fprintf(config.outfile, " '%s'", wrbuf_cstr(sw));
+                        fprintf(p_config->outfile, " '%s'", wrbuf_cstr(sw));

                     }
                     }

-                    fprintf(config.outfile, "\n");
+                    fprintf(p_config->outfile, "\n");

                 }
             }
         }
                 }
             }
         }

@@ -547,11 +546,11 @@ static void process_text_file(const struct config_t *p_config)
     }
 
     if (p_config->xmloutput)
     }
 
     if (p_config->xmloutput)

-        fprintf(config.outfile,
+        fprintf(p_config->outfile,

                 "</tokens>\n"
                 "</icu>\n");
     
                 "</tokens>\n"
                 "</icu>\n");
     

-    icu_chain_destroy(config.chain);
+    icu_chain_destroy(p_config->chain);

     xmlFreeDoc(doc);
     if (line)
         free(line);
     xmlFreeDoc(doc);
     if (line)
         free(line);

@@ -562,9 +561,9 @@ static void process_text_file(const struct config_t *p_config)
 
 int main(int argc, char **argv) 
 {
 
 int main(int argc, char **argv) 
 {

+    struct config_t config;

 
 #if YAZ_HAVE_ICU
 
 #if YAZ_HAVE_ICU

-

     read_params(argc, argv, &config);
 
     if (config.conffile && strlen(config.conffile))
     read_params(argc, argv, &config);
 
     if (config.conffile && strlen(config.conffile))

@@ -573,6 +572,7 @@ int main(int argc, char **argv)
     if (config.print && strlen(config.print))
         print_info(&config);
 
     if (config.print && strlen(config.print))
         print_info(&config);
 

+    u_cleanup();

 #else /* YAZ_HAVE_ICU */
 
     printf("ICU not available on your system.\n"
 #else /* YAZ_HAVE_ICU */
 
     printf("ICU not available on your system.\n"