From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 29 Sep 2009 13:08:49 +0000 (+0200)
Subject: Optimize trie look for char conv.
X-Git-Tag: v3.0.49~1
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=b2b333d62406d7497da3b8af5fb3a4e8f0a7b505;p=yaz-moved-to-github.git

Optimize trie look for char conv.

The lookup function now saves one function call for every character -
to improve performance for conversion from/to MARC8.
---

diff --git a/src/charconv.tcl b/src/charconv.tcl
index f09b82e..d57f226 100644
--- a/src/charconv.tcl
+++ b/src/charconv.tcl
@@ -37,19 +37,22 @@ proc preamble_trie {ofilehandle ifiles ofile} {
         static unsigned long lookup(struct yaz_iconv_trie **ptrs, int ptr, unsigned char *inp,
                                     size_t inbytesleft, size_t *no_read, int *combining, unsigned mask, int boffset)
         {
-            struct yaz_iconv_trie *t = (ptr > 0) ? ptrs[ptr-1] : 0;
-            if (!t || inbytesleft < 1)
+            struct yaz_iconv_trie *t = ptrs[ptr-1];
+            if (inbytesleft < 1)
                 return 0;
             if (t->dir)
             {
                 size_t ch = (inp[0] & mask) + boffset;
-                unsigned long code =
-                lookup(ptrs, t->dir[ch].ptr, inp+1, inbytesleft-1, no_read, combining, mask, boffset);
-                if (code)
+                unsigned long code;
+                if (t->dir[ch].ptr)
                 {
-                    (*no_read)++;
-                    return code;
-                }
+                    code = lookup(ptrs, t->dir[ch].ptr, inp+1, inbytesleft-1, no_read, combining, mask, boffset);
+		    if (code)
+		    {
+			(*no_read)++;
+			return code;
+		    }
+		}
                 if (t->dir[ch].to)
                 {
                     code = t->dir[ch].to;