Put local variables footer in all c, h files.

[idzebra-moved-to-github.git] / util / charmap.c

diff --git a/util/charmap.c b/util/charmap.c
index 2919837..d38be4f 100644 (file)
--- a/util/charmap.c
+++ b/util/charmap.c
@@ -1,4 +1,4 @@
-/* $Id: charmap.c,v 1.37 2005-06-14 12:42:49 adam Exp $
+/* $Id: charmap.c,v 1.40 2006-05-10 08:13:44 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -101,11 +101,12 @@ static chr_t_entry *set_map_string(chr_t_entry *root, NMEM nmem,
     }
     if (!len)
     {
-       if (!root->target || !root->target[0] || strcmp(root->target[0], to))
+       if (!root->target || !root->target[0] || 
+           strcmp((const char *) root->target[0], to))
        {
             if (from_0 && 
                 root->target && root->target[0] && root->target[0][0] &&
-                strcmp (root->target[0], CHR_UNKNOWN))
+                strcmp((const char *) root->target[0], CHR_UNKNOWN))
             {
                 yaz_log (YLOG_WARN, "duplicate entry for charmap from '%s'",
                          from_0);
@@ -510,8 +511,8 @@ static int scan_string(char *s_native,
     return 0;
 }
 
-chrmaptab chrmaptab_create(const char *tabpath, const char *name, int map_only,
-                           const char *tabroot)
+chrmaptab chrmaptab_create(const char *tabpath, const char *name,
+                          const char *tabroot)
 {
     FILE *f;
     char line[512], *argv[50];
@@ -525,17 +526,18 @@ chrmaptab chrmaptab_create(const char *tabpath, const char *name, int map_only,
     unsigned endian = 31;
     const char *ucs4_native = "UCS-4";
 
-    if (*(char*) &endian == 31)      /* little endian? */
-        ucs4_native = "UCS-4LE";
-
-    t_utf8 = yaz_iconv_open ("UTF-8", ucs4_native);
-
     yaz_log (YLOG_DEBUG, "maptab %s open", name);
     if (!(f = yaz_fopen(tabpath, name, "r", tabroot)))
     {
        yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", name);
        return 0;
     }
+
+    if (*(char*) &endian == 31)      /* little endian? */
+        ucs4_native = "UCS-4LE";
+
+    t_utf8 = yaz_iconv_open ("UTF-8", ucs4_native);
+
     nmem = nmem_create ();
     res = (chrmaptab) nmem_malloc(nmem, sizeof(*res));
     res->nmem = nmem;
@@ -554,15 +556,7 @@ chrmaptab chrmaptab_create(const char *tabpath, const char *name, int map_only,
        res->input->children[i]->target = (unsigned char **)
            nmem_malloc (res->nmem, 2 * sizeof(unsigned char *));
        res->input->children[i]->target[1] = 0;
-       if (map_only)
-       {
-           res->input->children[i]->target[0] = (unsigned char *)
-               nmem_malloc (res->nmem, 2 * sizeof(unsigned char));
-           res->input->children[i]->target[0][0] = i;
-           res->input->children[i]->target[0][1] = 0;
-       }
-       else
-           res->input->children[i]->target[0] = (unsigned char*) CHR_UNKNOWN;
+       res->input->children[i]->target[0] = (unsigned char*) CHR_UNKNOWN;
     }
     res->q_input = (chr_t_entry *)
        nmem_malloc(res->nmem, sizeof(*res->q_input));
@@ -576,7 +570,7 @@ chrmaptab chrmaptab_create(const char *tabpath, const char *name, int map_only,
     res->base_uppercase = 0;
 
     while (!errors && (argc = readconf_line(f, &lineno, line, 512, argv, 50)))
-       if (!map_only && !yaz_matchstr(argv[0], "lowercase"))
+       if (!yaz_matchstr(argv[0], "lowercase"))
        {
            if (argc != 2)
            {
@@ -594,7 +588,7 @@ chrmaptab chrmaptab_create(const char *tabpath, const char *name, int map_only,
            res->output[(int) *CHR_UNKNOWN + num] = (unsigned char*) "@";
            num = (int) *CHR_BASE;
        }
-       else if (!map_only && !yaz_matchstr(argv[0], "uppercase"))
+       else if (!yaz_matchstr(argv[0], "uppercase"))
        {
            if (!res->base_uppercase)
            {
@@ -613,7 +607,7 @@ chrmaptab chrmaptab_create(const char *tabpath, const char *name, int map_only,
                ++errors;
            }
        }
-       else if (!map_only && !yaz_matchstr(argv[0], "space"))
+       else if (!yaz_matchstr(argv[0], "space"))
        {
            if (argc != 2)
            {
@@ -627,7 +621,7 @@ chrmaptab chrmaptab_create(const char *tabpath, const char *name, int map_only,
                ++errors;
            }
        }
-       else if (!map_only && !yaz_matchstr(argv[0], "cut"))
+       else if (!yaz_matchstr(argv[0], "cut"))
        {
            if (argc != 2)
            {
@@ -769,3 +763,11 @@ void chrmaptab_destroy(chrmaptab tab)
 }
 
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+