Merge.

[idzebra-moved-to-github.git] / include / dict.h

diff --git a/include/dict.h b/include/dict.h
index 84b6e48..6367d94 100644 (file)
--- a/include/dict.h
+++ b/include/dict.h
@@ -1,10 +1,16 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
+ * Copyright (C) 1994-1996, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dict.h,v $
- * Revision 1.21  1996-05-24 14:46:07  adam
+ * Revision 1.23  1996-10-29 13:45:33  adam
+ * Changed definition of DICT_DEFAULT_PAGESIZE.
+ *
+ * Revision 1.22  1996/06/04 10:20:10  adam
+ * Added support for character mapping.
+ *
+ * Revision 1.21  1996/05/24  14:46:07  adam
  * Added dict_grep_cmap function to define user-mapping in grep lookups.
  *
  * Revision 1.20  1996/03/20  09:35:23  adam
@@ -81,6 +87,7 @@
 #define DICT_H
 
 #include <bfile.h>
+#include <log.h>
 
 typedef unsigned Dict_ptr;
 typedef unsigned char Dict_char;
@@ -121,13 +128,13 @@ typedef struct Dict_file_struct
 typedef struct Dict_struct {
     int rw;
     Dict_BFile dbf;
-    char **(*grep_cmap)(const char **from);
+    char **(*grep_cmap)(const char **from, int len);
     struct Dict_head head;
 } *Dict;
 
 #define DICT_MAGIC "dict00"
 
-#define DICT_DEFAULT_PAGESIZE "4096"
+#define DICT_DEFAULT_PAGESIZE 4096
 
 int        dict_bf_readp (Dict_BFile bf, int no, void **bufp);
 int        dict_bf_newp (Dict_BFile bf, int no, void **bufp);
@@ -154,7 +161,8 @@ int    dict_scan (Dict dict, char *str,
                      int (*f)(char *name, const char *info, int pos,
                                void *client));
 
-void       dict_grep_cmap (Dict dict, char **(*cmap)(const char **from));
+void       dict_grep_cmap (Dict dict,
+                           char **(*cmap)(const char **from, int len));
 
 
 #define DICT_EOS        0