Changed stupid log.

[idzebra-moved-to-github.git] / dict / lookup.c

diff --git a/dict/lookup.c b/dict/lookup.c
index 3673e24..8719af7 100644 (file)
--- a/dict/lookup.c
+++ b/dict/lookup.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: lookup.c,v $
- * Revision 1.2  1994-09-16 15:39:14  adam
+ * Revision 1.5  1995-09-04 09:09:15  adam
+ * String arg in lookup is const.
+ *
+ * Revision 1.4  1994/10/05  12:16:51  adam
+ * Pagesize is a resource now.
+ *
+ * Revision 1.3  1994/09/26  10:17:25  adam
+ * Minor changes.
+ *
+ * Revision 1.2  1994/09/16  15:39:14  adam
  * Initial code of lookup - not tested yet.
  *
  * Revision 1.1  1994/08/16  16:26:48  adam
@@ -19,7 +28,7 @@
 
 #include <dict.h>
 
-static char *dict_look (Dict dict, Dict_char *str)
+static char *dict_look (Dict dict, const Dict_char *str)
 {
     Dict_ptr ptr = 1;
     int mid, lo, hi;
@@ -31,7 +40,7 @@ static char *dict_look (Dict dict, Dict_char *str)
     dict_bf_readp (dict->dbf, ptr, &p);
     mid = lo = 0;
     hi = DICT_nodir(p)-1;
-    indxp = (short*) ((char*) p+DICT_PAGESIZE-sizeof(short));    
+    indxp = (short*) ((char*) p+DICT_pagesize(dict)-sizeof(short));    
     while (lo <= hi)
     {
         mid = (lo+hi)/2;
@@ -61,7 +70,11 @@ static char *dict_look (Dict dict, Dict_char *str)
             {
                 memcpy (&subptr, info, sizeof(Dict_ptr));
                 if (*++str == DICT_EOS)
-                    return info+sizeof(Dict_ptr)+sizeof(Dict_char);
+                {
+                    if (info[sizeof(Dict_ptr)+sizeof(Dict_char)])
+                        return info+sizeof(Dict_ptr)+sizeof(Dict_char);
+                    return NULL;
+                }
                 else
                 {
                     if (subptr == 0)
@@ -70,7 +83,8 @@ static char *dict_look (Dict dict, Dict_char *str)
                     dict_bf_readp (dict->dbf, ptr, &p);
                     mid = lo = 0;
                     hi = DICT_nodir(p)-1;
-                    indxp = (short*) ((char*) p+DICT_PAGESIZE-sizeof(short));
+                    indxp = (short*) ((char*) p+DICT_pagesize(dict)
+                                      -sizeof(short));
                     continue;
                 }
             }
@@ -83,7 +97,7 @@ static char *dict_look (Dict dict, Dict_char *str)
     return NULL;
 }
 
-char *dict_lookup (Dict dict, Dict_char *p)
+char *dict_lookup (Dict dict, const Dict_char *p)
 {
     if (dict->head.last == 1)
         return NULL;