X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fcharmap.c;h=60bc25401ad4f358814bc358b9ae64b1485ea5a6;hb=de4ada45ce039553f8322e620cc047d8cf4a065e;hp=0f87f60ed397088c15bd5b4ecbd791acd545de1c;hpb=2ff1b56a4ff7022b426d4e36ec7d544f22fe7b87;p=idzebra-moved-to-github.git diff --git a/util/charmap.c b/util/charmap.c index 0f87f60..60bc254 100644 --- a/util/charmap.c +++ b/util/charmap.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: charmap.c,v $ - * Revision 1.10 1997-07-01 13:01:08 adam + * Revision 1.11 1997-09-05 09:52:32 adam + * Extra argument added to function chr_read_maptab (tab path). + * + * Revision 1.10 1997/07/01 13:01:08 adam * Bug fix in routine find_entry: didn't take into account the len arg. * * Revision 1.9 1996/10/29 13:48:14 adam @@ -58,8 +61,6 @@ const char *CHR_UNKNOWN = "\001"; const char *CHR_SPACE = "\002"; const char *CHR_BASE = "\003"; -extern char *data1_tabpath; - /* * Character map trie node. */ @@ -347,14 +348,14 @@ static int scan_string(char *s, void (*fun)(char *c, void *data, int num), return 0; } -chrmaptab *chr_read_maptab(char *name) +chrmaptab *chr_read_maptab(const char *tabpath, const char *name) { FILE *f; char line[512], *argv[50]; chrmaptab *res = xmalloc(sizeof(*res)); int argc, num = (int) *CHR_BASE, i; - if (!(f = yaz_path_fopen(data1_tabpath, name, "r"))) + if (!(f = yaz_path_fopen(tabpath, name, "r"))) { logf(LOG_WARN|LOG_ERRNO, "%s", name); return 0;