X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2Flookup.c;h=b7dd51c0dbdc1e8bdfba45b992a75ef541a35fbf;hb=a4e93d62564084d6d1b6670d4fe75dd70a6ed139;hp=19eaf9acf5c550e4c8b5a5ab138da0fd9670cfc2;hpb=30bfffa1e13e0ebd1d7eac84518705e2fbcd955b;p=idzebra-moved-to-github.git

diff --git a/dict/lookup.c b/dict/lookup.c
index 19eaf9a..b7dd51c 100644
--- a/dict/lookup.c
+++ b/dict/lookup.c
@@ -1,10 +1,26 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: lookup.c,v $
- * Revision 1.4  1994-10-05 12:16:51  adam
+ * Revision 1.9  1999-02-02 14:50:25  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.8  1998/03/05 08:17:24  adam
+ * Added a few comments - no code changed.
+ *
+ * Revision 1.7  1996/02/02 13:43:51  adam
+ * The public functions simply use char instead of Dict_char to represent
+ * search strings. Dict_char is used internally only.
+ *
+ * Revision 1.6  1995/12/11  09:04:50  adam
+ * Bug fix: the lookup/scan/lookgrep didn't handle empty dictionary.
+ *
+ * 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
@@ -25,7 +41,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;
@@ -49,7 +65,8 @@ static char *dict_look (Dict dict, Dict_char *str)
             info = (char*)p + indxp[-mid];
             cmp = dict_strcmp((Dict_char*) info, str);
             if (!cmp)
-                return info+(dict_strlen (info)+1)*sizeof(Dict_char);
+                return info+(dict_strlen ((Dict_char*) info)+1)
+                    *sizeof(Dict_char);
         }
         else
         {
@@ -94,11 +111,11 @@ 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 char *p)
 {
-    if (dict->head.last == 1)
+    if (dict->head.last <= 1)
         return NULL;
-    return dict_look (dict, p);
+    return dict_look (dict, (const Dict_char *) p);
 }