X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=dict%2Finsert.c;h=d43572c2d9e08481fc9f99229f3c4fbb052f5a58;hb=889c4058f1b6330d51f9f26fea7c1fe2148c85e8;hp=ff99b663850b306a3310d8725d2938be270f488f;hpb=0035afa7de3e06c18bf2f559649f34913114ab46;p=idzebra-moved-to-github.git

diff --git a/dict/insert.c b/dict/insert.c
index ff99b66..d43572c 100644
--- a/dict/insert.c
+++ b/dict/insert.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: insert.c,v $
- * Revision 1.9  1994-09-16 15:39:13  adam
+ * Revision 1.12  1995-09-06 10:34:44  adam
+ * Memcpy in clean_page edited to satisfy checkergcc.
+ *
+ * Revision 1.11  1995/09/04  12:33:31  adam
+ * Various cleanup. YAZ util used instead.
+ *
+ * Revision 1.10  1994/10/05  12:16:48  adam
+ * Pagesize is a resource now.
+ *
+ * Revision 1.9  1994/09/16  15:39:13  adam
  * Initial code of lookup - not tested yet.
  *
  * Revision 1.8  1994/09/16  12:35:01  adam
@@ -90,7 +99,7 @@ static int split_page (Dict dict, Dict_ptr ptr, void *p)
     int best_no = -1, no_current = 1;
 
     /* determine splitting char... */
-    indxp = (short*) ((char*) p+DICT_PAGESIZE-sizeof(short));
+    indxp = (short*) ((char*) p+DICT_pagesize(dict)-sizeof(short));
     for (i = DICT_nodir (p); --i >= 0; --indxp)
     {
         if (*indxp > 0) /* tail string here! */
@@ -156,15 +165,15 @@ static int split_page (Dict dict, Dict_ptr ptr, void *p)
 }
 
 static void clean_page (Dict dict, Dict_ptr ptr, void *p, Dict_char *out,
-        	Dict_ptr subptr, char *userinfo)             
+                        Dict_ptr subptr, char *userinfo)             
 {
     char *np = xmalloc (dict->head.page_size);
     int i, slen, no = 0;
     short *indxp1, *indxp2;
     char *info1, *info2;
 
-    indxp1 = (short*) ((char*) p+DICT_PAGESIZE-sizeof(short));
-    indxp2 = (short*) ((char*) np+DICT_PAGESIZE);
+    indxp1 = (short*) ((char*) p+DICT_pagesize(dict)-sizeof(short));
+    indxp2 = (short*) ((char*) np+DICT_pagesize(dict));
     info2 = (char*) np + DICT_infoffset;
     for (i = DICT_nodir (p); --i >= 0; --indxp1)
     {
@@ -220,8 +229,17 @@ static void clean_page (Dict dict, Dict_ptr ptr, void *p, Dict_char *out,
         info2 += slen;
         ++no;
     }
+#if 1
+    memcpy ((char*)p+DICT_infoffset, 
+            (char*)np+DICT_infoffset,
+            info2 - ((char*)np+DICT_infoffset));
+    memcpy ((char*)p + ((char*)indxp2 - (char*)np),
+            indxp2,
+            ((char*) np+DICT_pagesize(dict)) - (char*)indxp2);
+#else
     memcpy ((char*)p+DICT_infoffset, (char*)np+DICT_infoffset,
-            DICT_PAGESIZE-DICT_infoffset);
+            DICT_pagesize(dict)-DICT_infoffset);
+#endif
     DICT_size(p) = info2 - np;
     DICT_type(p) = 0;
     DICT_nodir(p) = no;
@@ -254,7 +272,7 @@ static int dict_ins (Dict dict, const Dict_char *str,
 
     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;
@@ -333,7 +351,7 @@ static int dict_ins (Dict dict, const Dict_char *str,
                     }
                     if (DICT_size(p)+sizeof(Dict_char)+sizeof(Dict_ptr)+
                         userlen >=
-                        DICT_PAGESIZE - (1+DICT_nodir(p))*sizeof(short))
+                        DICT_pagesize(dict) - (1+DICT_nodir(p))*sizeof(short))
                     {
                         if (DICT_type(p) == 1)
                         {
@@ -343,7 +361,7 @@ static int dict_ins (Dict dict, const Dict_char *str,
                         }
                         if (split_page (dict, ptr, p)) 
                         {
-                            log (LOG_FATAL, "Unable to split page %d\n", ptr);
+                            logf (LOG_FATAL, "Unable to split page %d\n", ptr);
                             abort ();
                         }
                         return dict_ins (dict, str-1, ptr, userlen, userinfo);
@@ -388,7 +406,7 @@ static int dict_ins (Dict dict, const Dict_char *str,
         --indxp;
     slen = (dict_strlen(str)+1)*sizeof(Dict_char);
     if (DICT_size(p)+slen+userlen >=
-        DICT_PAGESIZE - (1+DICT_nodir(p))*sizeof(short)) /* overflow? */
+        DICT_pagesize(dict) - (1+DICT_nodir(p))*sizeof(short)) /* overflow? */
     {
         split_page (dict, ptr, p);
         return dict_ins (dict, str, ptr, userlen, userinfo);
@@ -397,12 +415,12 @@ static int dict_ins (Dict dict, const Dict_char *str,
     {
         short *indxp1;
         (DICT_nodir(p))++;
-        indxp1 = (short*)((char*) p + DICT_PAGESIZE
+        indxp1 = (short*)((char*) p + DICT_pagesize(dict)
                           - DICT_nodir(p)*sizeof(short));
         for (; indxp1 != indxp; indxp1++)
             indxp1[0] = indxp1[1];
 #if CHECK
-        indxp1 = (short*) ((char*) p+DICT_PAGESIZE-sizeof(short));
+        indxp1 = (short*) ((char*) p+DICT_pagesize(dict)-sizeof(short));
         for (i = DICT_nodir (p); --i >= 0; --indxp1)
         {
             if (*indxp1 < 0)