X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2Fdelete.c;h=e126a4f2ff0af7fdf0005446ef36051a5a95019f;hb=4eb3b54bb2ca9af74f39f000d3d40dba99ded887;hp=6b0d565b434ae350fded37d4fb52ca1e6713f8ea;hpb=896c0427df9d8eff5de6a1735dcd992e067df844;p=idzebra-moved-to-github.git

diff --git a/dict/delete.c b/dict/delete.c
index 6b0d565..e126a4f 100644
--- a/dict/delete.c
+++ b/dict/delete.c
@@ -1,5 +1,5 @@
-/* $Id: delete.c,v 1.8 2002-08-02 19:26:55 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: delete.c,v 1.10 2004-12-08 12:23:08 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -20,69 +20,62 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-
-
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <assert.h>
 
-#include <dict.h>
+#include "dict-p.h"
 
 static void dict_del_subtree (Dict dict, Dict_ptr ptr,
 			      void *client, 
 			      int (*f)(const char *, void *))
 {
-    int more = 1;
     void *p = 0;
+    short *indxp;
+    int i, hi;
     
     if (!ptr)
 	return;
-    
-    while (more)
-    {
-	short *indxp;
-	int i, hi;
 	
-	dict_bf_readp (dict->dbf, ptr, &p);
-	hi = DICT_nodir(p)-1;
-	indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
-	more = 0;
-	for (i = 0; i <= hi; i++)
+    dict_bf_readp (dict->dbf, ptr, &p);
+    indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
+    hi = DICT_nodir(p)-1;
+    for (i = 0; i <= hi; i++)
+    {
+	if (indxp[-i] > 0)
 	{
-	    if (indxp[-i] > 0)
+	    /* string (Dict_char *) DICT_EOS terminated */
+	    /* unsigned char        length of information */
+	    /* char *               information */
+	    char *info = (char*)p + indxp[-i];
+	    if (f)
+		(*f)(info + (dict_strlen((Dict_char*) info)+1)
+		     *sizeof(Dict_char), client);
+	}
+	else
+	{
+	    Dict_ptr subptr;
+	    
+	    /* Dict_ptr             subptr */
+	    /* Dict_char            sub char */
+	    /* unsigned char        length of information */
+	    /* char *               information */
+	    char *info = (char*)p - indxp[-i];
+	    memcpy (&subptr, info, sizeof(Dict_ptr));
+	    
+	    if (info[sizeof(Dict_ptr)+sizeof(Dict_char)])
 	    {
-		/* string (Dict_char *) DICT_EOS terminated */
-		/* unsigned char        length of information */
-		/* char *               information */
-		char *info = (char*)p + indxp[-i];
 		if (f)
-		    (*f)(info + (dict_strlen((Dict_char*) info)+1)
-			 *sizeof(Dict_char), client);
+		    (*f)(info+sizeof(Dict_ptr)+sizeof(Dict_char), client);
 	    }
-	    else
+	    if (subptr)
 	    {
-		
-		Dict_ptr subptr;
-	    
-		/* Dict_ptr             subptr */
-		/* Dict_char            sub char */
-		/* unsigned char        length of information */
-		/* char *               information */
-		char *info = (char*)p - indxp[-i];
-		memcpy (&subptr, info, sizeof(Dict_ptr));
-
-		if (info[sizeof(Dict_ptr)+sizeof(Dict_char)])
-		{
-		    if (f)
-			(*f)(info+sizeof(Dict_ptr)+sizeof(Dict_char), client);
-		}
-		if (subptr)
-		{
-		    dict_del_subtree (dict, subptr, client, f);
-		    more = 1;
-		    break;
-		}
+		dict_del_subtree (dict, subptr, client, f);
+	
+		/* page may be gone. reread it .. */
+		dict_bf_readp (dict->dbf, ptr, &p);
+		indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
 	    }
 	}
     }