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

diff --git a/dict/delete.c b/dict/delete.c
index 6b0d565..f29f6bd 100644
--- a/dict/delete.c
+++ b/dict/delete.c
@@ -1,6 +1,6 @@
-/* $Id: delete.c,v 1.8 2002-08-02 19:26:55 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
+/* $Id: delete.c,v 1.13 2006-08-14 10:40:09 adam Exp $
+   Copyright (C) 1995-2006
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -15,74 +15,67 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
-*/
-
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  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)
+	{
+	    /* 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
 	{
-	    if (indxp[-i] > 0)
+	    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));
 	    }
 	}
     }
@@ -236,3 +229,11 @@ int dict_delete_subtree (Dict dict, const char *p, void *client,
     return dict_del_string (dict, (const Dict_char*) p, dict->head.root, 1,
 			    client, f);
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+