X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dict%2Fdelete.c;h=cff7db49424d9fbaf4f0e3b5b6977284b856859a;hp=8b217b1b0bf4eefa15b5acfe36421b599a260b47;hb=89d16cf15eda0e4802d18b8ad09bd3653508ebfc;hpb=3b7b0e72cc359c7df837fe7ff1252f2efecd41c7

diff --git a/dict/delete.c b/dict/delete.c
index 8b217b1..cff7db4 100644
--- a/dict/delete.c
+++ b/dict/delete.c
@@ -1,95 +1,78 @@
-/*
- * Copyright (C) 1994-2000, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: delete.c,v $
- * Revision 1.7  2000-12-05 09:59:10  adam
- * Work on dict_delete_subtree.
- *
- * Revision 1.6  1999/05/15 14:36:37  adam
- * Updated dictionary. Implemented "compression" of dictionary.
- *
- * Revision 1.5  1999/02/02 14:50:17  adam
- * Updated WIN32 code specific sections. Changed header.
- *
- * Revision 1.4  1996/02/02 13:43:50  adam
- * The public functions simply use char instead of Dict_char to represent
- * search strings. Dict_char is used internally only.
- *
- * Revision 1.3  1995/12/07  11:48:55  adam
- * Insert operation obeys DICT_type = 1 (slack in page).
- * Function dict_open exists if page size or magic aren't right.
- *
- * Revision 1.2  1995/12/06  17:48:30  adam
- * Bug fix: delete didn't work.
- *
- * Revision 1.1  1995/12/06  14:52:21  adam
- * New function: dict_delete.
- *
- */
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2009 Index Data
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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 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));
 	    }
 	}
     }
@@ -243,3 +226,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
+ */
+