X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fcharmap.c;h=2919837f306ac081366745553dd2384f690a433c;hb=47eeb5384a8fae8bcac8afb8a84782ca094683f9;hp=bfcd9635ef7a210ca6af23cfcf906fa79b23921c;hpb=0cac58c528d39e9838a4ee6e3f76bc5ca6bd30bf;p=idzebra-moved-to-github.git

diff --git a/util/charmap.c b/util/charmap.c
index bfcd963..2919837 100644
--- a/util/charmap.c
+++ b/util/charmap.c
@@ -1,4 +1,4 @@
-/* $Id: charmap.c,v 1.36 2005-03-11 17:56:36 adam Exp $
+/* $Id: charmap.c,v 1.37 2005-06-14 12:42:49 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -241,50 +241,6 @@ const char *chr_map_output(chrmaptab maptab, const char **from, int len)
     return (const char*) maptab->output[c];
 }
 
-unsigned char zebra_prim(char **s)
-{
-    unsigned char c;
-    unsigned int i = 0;
-
-    yaz_log (YLOG_DEBUG, "prim %.3s", *s);
-    if (**s == '\\')
-    {
-        (*s)++;
-        c = **s;
-        switch (c)
-        {
-        case '\\': c = '\\'; (*s)++; break;
-        case 'r': c = '\r'; (*s)++; break;
-        case 'n': c = '\n'; (*s)++; break;
-        case 't': c = '\t'; (*s)++; break;
-        case 's': c = ' '; (*s)++; break;
-        case 'x': sscanf(*s, "x%2x", &i); c = i; *s += 3; break;
-        case '0':
-        case '1':
-        case '2':
-        case '3':
-        case '4':
-        case '5':
-        case '6':
-        case '7':
-        case '8':
-        case '9':
-            sscanf(*s, "%3o", &i);
-            c = i;
-            *s += 3;
-            break;
-        default:
-            (*s)++;
-        }
-    }
-    else
-    {
-        c = **s;
-        ++(*s);
-    }
-    return c;
-}
-
 static int zebra_ucs4_strlen(ucs4_t *s)
 {
     int i = 0;
@@ -300,7 +256,7 @@ ucs4_t zebra_prim_w(ucs4_t **s)
     char fmtstr[8];
 
     yaz_log (YLOG_DEBUG, "prim_w %.3s", (char *) *s);
-    if (**s == '\\')
+    if (**s == '\\' && 1[*s])
     {
 	(*s)++;
 	c = **s;
@@ -533,7 +489,6 @@ static int scan_string(char *s_native,
 		(*fun)(str, data, num ? (*num)++ : 0);
 	    }
 	    break;
-	case '[': s++; abort(); break;
 	case '(':
             ++s;
 	    s0 = s; i = 0;