From b2b333d62406d7497da3b8af5fb3a4e8f0a7b505 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 29 Sep 2009 15:08:49 +0200 Subject: [PATCH] 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. --- src/charconv.tcl | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) 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; -- 1.7.10.4