Make dict_str{cmp,ncmp,len} internal

diff --git a/dict/dict-p.h b/dict/dict-p.h
index 3d9c722..4ba0fdf 100644 (file)
--- a/dict/dict-p.h
+++ b/dict/dict-p.h
@@ -1,4 +1,4 @@
-/* $Id: dict-p.h,v 1.5 2006-08-14 10:40:09 adam Exp $
+/* $Id: dict-p.h,v 1.6 2006-08-29 09:27:55 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -33,6 +33,8 @@ YAZ_BEGIN_CDECL
 
 #define DICT_DEFAULT_PAGESIZE 4096
 
+typedef unsigned char Dict_char;
+
 struct Dict_head {
     char magic_str[8];
     int page_size;
@@ -86,6 +88,13 @@ Dict_BFile dict_bf_open (BFiles bfs, const char *name, int block_size,
 int        dict_bf_close (Dict_BFile dbf);
 void       dict_bf_compact (Dict_BFile dbf);
 
+int dict_strcmp (const Dict_char *s1, const Dict_char *s2);
+
+int dict_strncmp (const Dict_char *s1, const Dict_char *s2, size_t n);
+
+int dict_strlen (const Dict_char *s);
+
+
 #define DICT_EOS        0
 #define DICT_type(x)    0[(Dict_ptr*) x]
 #define DICT_backptr(x) 1[(Dict_ptr*) x]

diff --git a/include/idzebra/dict.h b/include/idzebra/dict.h
index d567111..11209d0 100644 (file)
--- a/include/idzebra/dict.h
+++ b/include/idzebra/dict.h
@@ -1,4 +1,4 @@
-/* $Id: dict.h,v 1.6 2006-08-14 10:40:14 adam Exp $
+/* $Id: dict.h,v 1.7 2006-08-29 09:27:56 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -44,7 +44,6 @@ YAZ_BEGIN_CDECL
 typedef struct Dict_struct *Dict;
 
 typedef unsigned Dict_ptr;
-typedef unsigned char Dict_char;
 
 YAZ_EXPORT 
 Dict dict_open (BFiles bfs, const char *name, int cache, int rw,
@@ -74,15 +73,6 @@ int dict_lookup_grep (Dict dict, const char *p, int range, void *client,
                      int (*f)(char *name, const char *info, void *client));
 
 YAZ_EXPORT
-int dict_strcmp (const Dict_char *s1, const Dict_char *s2);
-
-YAZ_EXPORT
-int dict_strncmp (const Dict_char *s1, const Dict_char *s2, size_t n);
-
-YAZ_EXPORT
-int dict_strlen (const Dict_char *s);
-
-YAZ_EXPORT
 int dict_scan (Dict dict, char *str, 
               int *before, int *after, void *client,
               int (*f)(char *name, const char *info, int pos, void *client));